cleanup

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageWidget.kt

CHANGELOG.md

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

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

@@ -260,9 +260,6 @@ object Cobblemon {
             RequestManager.onLogoff(it.player)
             serverPlayerStructs.remove(it.player.uuid)
         }
-        PlatformEvents.PLAYER_RESPAWN.subscribe {
-            serverPlayerStructs.remove(it.player.uuid)
-        }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
             battleRegistry.getBattleByParticipatingPlayer(it.player)?.stop()

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

@@ -845,35 +845,54 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(MobEffects.LEVITATION, 10F, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)))
     @JvmField
+    val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
+    @JvmField
     val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak()))
+
     @JvmField
     val GALARICA_NUT_BUSH = this.create("galarica_nut_bush", NutBushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH).pushReaction(PushReaction.DESTROY)))
 
+    @JvmField
+    val POTTED_RED_APRICORN_SAPLING = this.create("potted_red_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(RED_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_YELLOW_APRICORN_SAPLING = this.create("potted_yellow_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(YELLOW_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_GREEN_APRICORN_SAPLING = this.create("potted_green_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(GREEN_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLUE_APRICORN_SAPLING = this.create("potted_blue_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLUE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_PINK_APRICORN_SAPLING = this.create("potted_pink_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(PINK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLACK_APRICORN_SAPLING = this.create("potted_black_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLACK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_WHITE_APRICORN_SAPLING = this.create("potted_white_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(WHITE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))
 
     @JvmField
     val RED_MINT_LEAF_LITTER = this.mintLitter("red_mint_leaf_litter", MapColor.COLOR_RED)
     @JvmField
-    val POTTED_RED_MINT = this.flowerPot("potted_red_mint", RED_MINT_LEAF_LITTER)
+    val POTTED_RED_MINT = this.pottedPlant("potted_red_mint", RED_MINT_LEAF_LITTER)
     @JvmField
     val BLUE_MINT_LEAF_LITTER = this.mintLitter("blue_mint_leaf_litter", MapColor.COLOR_BLUE)
     @JvmField
-    val POTTED_BLUE_MINT = this.flowerPot("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
+    val POTTED_BLUE_MINT = this.pottedPlant("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
     @JvmField
     val CYAN_MINT_LEAF_LITTER = this.mintLitter("cyan_mint_leaf_litter", MapColor.COLOR_CYAN)
     @JvmField
-    val POTTED_CYAN_MINT = this.flowerPot("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
+    val POTTED_CYAN_MINT = this.pottedPlant("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
     @JvmField
     val PINK_MINT_LEAF_LITTER = this.mintLitter("pink_mint_leaf_litter", MapColor.COLOR_PINK)
     @JvmField
-    val POTTED_PINK_MINT = this.flowerPot("potted_pink_mint", PINK_MINT_LEAF_LITTER)
+    val POTTED_PINK_MINT = this.pottedPlant("potted_pink_mint", PINK_MINT_LEAF_LITTER)
     @JvmField
     val GREEN_MINT_LEAF_LITTER = this.mintLitter("green_mint_leaf_litter", MapColor.COLOR_GREEN)
     @JvmField
-    val POTTED_GREEN_MINT = this.flowerPot("potted_green_mint", GREEN_MINT_LEAF_LITTER)
+    val POTTED_GREEN_MINT = this.pottedPlant("potted_green_mint", GREEN_MINT_LEAF_LITTER)
     @JvmField
     val WHITE_MINT_LEAF_LITTER = this.mintLitter("white_mint_leaf_litter", MapColor.SNOW)
     @JvmField
-    val POTTED_WHITE_MINT = this.flowerPot("potted_white_mint", WHITE_MINT_LEAF_LITTER)
+    val POTTED_WHITE_MINT = this.pottedPlant("potted_white_mint", WHITE_MINT_LEAF_LITTER)
 
     @JvmField
     val LOBAILA = this.create("lobaila", LobailaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@@ -1085,163 +1104,145 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
     @JvmField
-    val POTTED_AGUAV_BERRY = this.flowerPot("potted_aguav_berry", AGUAV_BERRY)
+    val POTTED_AGUAV_BERRY = this.create("potted_aguav_berry", BlocksInvoker.createFlowerPotBlock(AGUAV_BERRY))
     @JvmField
-    val POTTED_APICOT_BERRY = this.flowerPot("potted_apicot_berry", APICOT_BERRY)
+    val POTTED_APICOT_BERRY = this.create("potted_apicot_berry", BlocksInvoker.createFlowerPotBlock(APICOT_BERRY))
     @JvmField
-    val POTTED_ASPEAR_BERRY = this.flowerPot("potted_aspear_berry", ASPEAR_BERRY)
+    val POTTED_ASPEAR_BERRY = this.create("potted_aspear_berry", BlocksInvoker.createFlowerPotBlock(ASPEAR_BERRY))
     @JvmField
-    val POTTED_BABIRI_BERRY = this.flowerPot("potted_babiri_berry", BABIRI_BERRY)
+    val POTTED_BABIRI_BERRY = this.create("potted_babiri_berry", BlocksInvoker.createFlowerPotBlock(BABIRI_BERRY))
     @JvmField
-    val POTTED_BELUE_BERRY = this.flowerPot("potted_belue_berry", BELUE_BERRY)
+    val POTTED_BELUE_BERRY = this.create("potted_belue_berry", BlocksInvoker.createFlowerPotBlock(BELUE_BERRY))
     @JvmField
-    val POTTED_BLUK_BERRY = this.flowerPot("potted_bluk_berry", BLUK_BERRY)
+    val POTTED_BLUK_BERRY = this.create("potted_bluk_berry", BlocksInvoker.createFlowerPotBlock(BLUK_BERRY))
     @JvmField
-    val POTTED_CHARTI_BERRY = this.flowerPot("potted_charti_berry", CHARTI_BERRY)
+    val POTTED_CHARTI_BERRY = this.create("potted_charti_berry", BlocksInvoker.createFlowerPotBlock(CHARTI_BERRY))
     @JvmField
-    val POTTED_CHERI_BERRY = this.flowerPot("potted_cheri_berry", CHERI_BERRY)
+    val POTTED_CHERI_BERRY = this.create("potted_cheri_berry", BlocksInvoker.createFlowerPotBlock(CHERI_BERRY))
     @JvmField
-    val POTTED_CHESTO_BERRY = this.flowerPot("potted_chesto_berry", CHESTO_BERRY)
+    val POTTED_CHESTO_BERRY = this.create("potted_chesto_berry", BlocksInvoker.createFlowerPotBlock(CHESTO_BERRY))
     @JvmField
-    val POTTED_CHILAN_BERRY = this.flowerPot("potted_chilan_berry", CHILAN_BERRY)
+    val POTTED_CHILAN_BERRY = this.create("potted_chilan_berry", BlocksInvoker.createFlowerPotBlock(CHILAN_BERRY))
     @JvmField
-    val POTTED_CHOPLE_BERRY = this.flowerPot("potted_chople_berry", CHOPLE_BERRY)
+    val POTTED_CHOPLE_BERRY = this.create("potted_chople_berry", BlocksInvoker.createFlowerPotBlock(CHOPLE_BERRY))
     @JvmField
-    val POTTED_COBA_BERRY = this.flowerPot("potted_coba_berry", COBA_BERRY)
+    val POTTED_COBA_BERRY = this.create("potted_coba_berry", BlocksInvoker.createFlowerPotBlock(COBA_BERRY))
     @JvmField
-    val POTTED_COLBUR_BERRY = this.flowerPot("potted_colbur_berry", COLBUR_BERRY)
+    val POTTED_COLBUR_BERRY = this.create("potted_colbur_berry", BlocksInvoker.createFlowerPotBlock(COLBUR_BERRY))
     @JvmField
-    val POTTED_CORNN_BERRY = this.flowerPot("potted_cornn_berry", CORNN_BERRY)
+    val POTTED_CORNN_BERRY = this.create("potted_cornn_berry", BlocksInvoker.createFlowerPotBlock(CORNN_BERRY))
     @JvmField
-    val POTTED_CUSTAP_BERRY = this.flowerPot("potted_custap_berry", CUSTAP_BERRY)
+    val POTTED_CUSTAP_BERRY = this.create("potted_custap_berry", BlocksInvoker.createFlowerPotBlock(CUSTAP_BERRY))
     @JvmField
-    val POTTED_DURIN_BERRY = this.flowerPot("potted_durin_berry", DURIN_BERRY)
+    val POTTED_DURIN_BERRY = this.create("potted_durin_berry", BlocksInvoker.createFlowerPotBlock(DURIN_BERRY))
     @JvmField
-    val POTTED_EGGANT_BERRY = this.flowerPot("potted_eggant_berry", EGGANT_BERRY)
+    val POTTED_EGGANT_BERRY = this.create("potted_eggant_berry", BlocksInvoker.createFlowerPotBlock(EGGANT_BERRY))
     @JvmField
-    val POTTED_ENIGMA_BERRY = this.flowerPot("potted_enigma_berry", ENIGMA_BERRY)
+    val POTTED_ENIGMA_BERRY = this.create("potted_enigma_berry", BlocksInvoker.createFlowerPotBlock(ENIGMA_BERRY))
     @JvmField
-    val POTTED_FIGY_BERRY = this.flowerPot("potted_figy_berry", FIGY_BERRY)
+    val POTTED_FIGY_BERRY = this.create("potted_figy_berry", BlocksInvoker.createFlowerPotBlock(FIGY_BERRY))
     @JvmField
-    val POTTED_GANLON_BERRY = this.flowerPot("potted_ganlon_berry", GANLON_BERRY)
+    val POTTED_GANLON_BERRY = this.create("potted_ganlon_berry", BlocksInvoker.createFlowerPotBlock(GANLON_BERRY))
     @JvmField
-    val POTTED_GREPA_BERRY = this.flowerPot("potted_grepa_berry", GREPA_BERRY)
+    val POTTED_GREPA_BERRY = this.create("potted_grepa_berry", BlocksInvoker.createFlowerPotBlock(GREPA_BERRY))
     @JvmField
-    val POTTED_HABAN_BERRY = this.flowerPot("potted_haban_berry", HABAN_BERRY)
+    val POTTED_HABAN_BERRY = this.create("potted_haban_berry", BlocksInvoker.createFlowerPotBlock(HABAN_BERRY))
     @JvmField
-    val POTTED_HONDEW_BERRY = this.flowerPot("potted_hondew_berry", HONDEW_BERRY)
+    val POTTED_HONDEW_BERRY = this.create("potted_hondew_berry", BlocksInvoker.createFlowerPotBlock(HONDEW_BERRY))
     @JvmField
-    val POTTED_HOPO_BERRY = this.flowerPot("potted_hopo_berry", HOPO_BERRY)
+    val POTTED_HOPO_BERRY = this.create("potted_hopo_berry", BlocksInvoker.createFlowerPotBlock(HOPO_BERRY))
     @JvmField
-    val POTTED_IAPAPA_BERRY = this.flowerPot("potted_iapapa_berry", IAPAPA_BERRY)
+    val POTTED_IAPAPA_BERRY = this.create("potted_iapapa_berry", BlocksInvoker.createFlowerPotBlock(IAPAPA_BERRY))
     @JvmField
-    val POTTED_JABOCA_BERRY = this.flowerPot("potted_jaboca_berry", JABOCA_BERRY)
+    val POTTED_JABOCA_BERRY = this.create("potted_jaboca_berry", BlocksInvoker.createFlowerPotBlock(JABOCA_BERRY))
     @JvmField
-    val POTTED_KASIB_BERRY = this.flowerPot("potted_kasib_berry", KASIB_BERRY)
+    val POTTED_KASIB_BERRY = this.create("potted_kasib_berry", BlocksInvoker.createFlowerPotBlock(KASIB_BERRY))
     @JvmField
-    val POTTED_KEBIA_BERRY = this.flowerPot("potted_kebia_berry", KEBIA_BERRY)
+    val POTTED_KEBIA_BERRY = this.create("potted_kebia_berry", BlocksInvoker.createFlowerPotBlock(KEBIA_BERRY))
     @JvmField
-    val POTTED_KEE_BERRY = this.flowerPot("potted_kee_berry", KEE_BERRY)
+    val POTTED_KEE_BERRY = this.create("potted_kee_berry", BlocksInvoker.createFlowerPotBlock(KEE_BERRY))
     @JvmField
-    val POTTED_KELPSY_BERRY = this.flowerPot("potted_kelpsy_berry", KELPSY_BERRY)
+    val POTTED_KELPSY_BERRY = this.create("potted_kelpsy_berry", BlocksInvoker.createFlowerPotBlock(KELPSY_BERRY))
     @JvmField
-    val POTTED_LANSAT_BERRY = this.flowerPot("potted_lansat_berry", LANSAT_BERRY)
+    val POTTED_LANSAT_BERRY = this.create("potted_lansat_berry", BlocksInvoker.createFlowerPotBlock(LANSAT_BERRY))
     @JvmField
-    val POTTED_LEPPA_BERRY = this.flowerPot("potted_leppa_berry", LEPPA_BERRY)
+    val POTTED_LEPPA_BERRY = this.create("potted_leppa_berry", BlocksInvoker.createFlowerPotBlock(LEPPA_BERRY))
     @JvmField
-    val POTTED_LIECHI_BERRY = this.flowerPot("potted_liechi_berry", LIECHI_BERRY)
+    val POTTED_LIECHI_BERRY = this.create("potted_liechi_berry", BlocksInvoker.createFlowerPotBlock(LIECHI_BERRY))
     @JvmField
-    val POTTED_LUM_BERRY = this.flowerPot("potted_lum_berry", LUM_BERRY)
+    val POTTED_LUM_BERRY = this.create("potted_lum_berry", BlocksInvoker.createFlowerPotBlock(LUM_BERRY))
     @JvmField
-    val POTTED_MAGO_BERRY = this.flowerPot("potted_mago_berry", MAGO_BERRY)
+    val POTTED_MAGO_BERRY = this.create("potted_mago_berry", BlocksInvoker.createFlowerPotBlock(MAGO_BERRY))
     @JvmField
-    val POTTED_MAGOST_BERRY = this.flowerPot("potted_magost_berry", MAGOST_BERRY)
+    val POTTED_MAGOST_BERRY = this.create("potted_magost_berry", BlocksInvoker.createFlowerPotBlock(MAGOST_BERRY))
     @JvmField
-    val POTTED_MARANGA_BERRY = this.flowerPot("potted_maranga_berry", MARANGA_BERRY)
+    val POTTED_MARANGA_BERRY = this.create("potted_maranga_berry", BlocksInvoker.createFlowerPotBlock(MARANGA_BERRY))
     @JvmField
-    val POTTED_MICLE_BERRY = this.flowerPot("potted_micle_berry", MICLE_BERRY)
+    val POTTED_MICLE_BERRY = this.create("potted_micle_berry", BlocksInvoker.createFlowerPotBlock(MICLE_BERRY))
     @JvmField
-    val POTTED_NANAB_BERRY = this.flowerPot("potted_nanab_berry", NANAB_BERRY)
+    val POTTED_NANAB_BERRY = this.create("potted_nanab_berry", BlocksInvoker.createFlowerPotBlock(NANAB_BERRY))
     @JvmField
-    val POTTED_NOMEL_BERRY = this.flowerPot("potted_nomel_berry", NOMEL_BERRY)
+    val POTTED_NOMEL_BERRY = this.create("potted_nomel_berry", BlocksInvoker.createFlowerPotBlock(NOMEL_BERRY))
     @JvmField
-    val POTTED_OCCA_BERRY = this.flowerPot("potted_occa_berry", OCCA_BERRY)
+    val POTTED_OCCA_BERRY = this.create("potted_occa_berry", BlocksInvoker.createFlowerPotBlock(OCCA_BERRY))
     @JvmField
-    val POTTED_ORAN_BERRY = this.flowerPot("potted_oran_berry", ORAN_BERRY)
+    val POTTED_ORAN_BERRY = this.create("potted_oran_berry", BlocksInvoker.createFlowerPotBlock(ORAN_BERRY))
     @JvmField
-    val POTTED_PAMTRE_BERRY = this.flowerPot("potted_pamtre_berry", PAMTRE_BERRY)
+    val POTTED_PAMTRE_BERRY = this.create("potted_pamtre_berry", BlocksInvoker.createFlowerPotBlock(PAMTRE_BERRY))
     @JvmField
-    val POTTED_PASSHO_BERRY = this.flowerPot("potted_passho_berry", PASSHO_BERRY)
+    val POTTED_PASSHO_BERRY = this.create("potted_passho_berry", BlocksInvoker.createFlowerPotBlock(PASSHO_BERRY))
     @JvmField
-    val POTTED_PAYAPA_BERRY = this.flowerPot("potted_payapa_berry", PAYAPA_BERRY)
+    val POTTED_PAYAPA_BERRY = this.create("potted_payapa_berry", BlocksInvoker.createFlowerPotBlock(PAYAPA_BERRY))
     @JvmField
-    val POTTED_PECHA_BERRY = this.flowerPot("potted_pecha_berry", PECHA_BERRY)
+    val POTTED_PECHA_BERRY = this.create("potted_pecha_berry", BlocksInvoker.createFlowerPotBlock(PECHA_BERRY))
     @JvmField
-    val POTTED_PERSIM_BERRY = this.flowerPot("potted_persim_berry", PERSIM_BERRY)
+    val POTTED_PERSIM_BERRY = this.create("potted_persim_berry", BlocksInvoker.createFlowerPotBlock(PERSIM_BERRY))
     @JvmField
-    val POTTED_PETAYA_BERRY = this.flowerPot("potted_petaya_berry", PETAYA_BERRY)
+    val POTTED_PETAYA_BERRY = this.create("potted_petaya_berry", BlocksInvoker.createFlowerPotBlock(PETAYA_BERRY))
     @JvmField
-    val POTTED_PINAP_BERRY = this.flowerPot("potted_pinap_berry", PINAP_BERRY)
+    val POTTED_PINAP_BERRY = this.create("potted_pinap_berry", BlocksInvoker.createFlowerPotBlock(PINAP_BERRY))
     @JvmField
-    val POTTED_POMEG_BERRY = this.flowerPot("potted_pomeg_berry", POMEG_BERRY)
+    val POTTED_POMEG_BERRY = this.create("potted_pomeg_berry", BlocksInvoker.createFlowerPotBlock(POMEG_BERRY))
     @JvmField
-    val POTTED_QUALOT_BERRY = this.flowerPot("potted_qualot_berry", QUALOT_BERRY)
+    val POTTED_QUALOT_BERRY = this.create("potted_qualot_berry", BlocksInvoker.createFlowerPotBlock(QUALOT_BERRY))
     @JvmField
-    val POTTED_RABUTA_BERRY = this.flowerPot("potted_rabuta_berry", RABUTA_BERRY)
+    val POTTED_RABUTA_BERRY = this.create("potted_rabuta_berry", BlocksInvoker.createFlowerPotBlock(RABUTA_BERRY))
     @JvmField
-    val POTTED_RAWST_BERRY = this.flowerPot("potted_rawst_berry", RAWST_BERRY)
+    val POTTED_RAWST_BERRY = this.create("potted_rawst_berry", BlocksInvoker.createFlowerPotBlock(RAWST_BERRY))
     @JvmField
-    val POTTED_RAZZ_BERRY = this.flowerPot("potted_razz_berry", RAZZ_BERRY)
+    val POTTED_RAZZ_BERRY = this.create("potted_razz_berry", BlocksInvoker.createFlowerPotBlock(RAZZ_BERRY))
     @JvmField
-    val POTTED_RINDO_BERRY = this.flowerPot("potted_rindo_berry", RINDO_BERRY)
+    val POTTED_RINDO_BERRY = this.create("potted_rindo_berry", BlocksInvoker.createFlowerPotBlock(RINDO_BERRY))
     @JvmField
-    val POTTED_ROSELI_BERRY = this.flowerPot("potted_roseli_berry", ROSELI_BERRY)
+    val POTTED_ROSELI_BERRY = this.create("potted_roseli_berry", BlocksInvoker.createFlowerPotBlock(ROSELI_BERRY))
     @JvmField
-    val POTTED_ROWAP_BERRY = this.flowerPot("potted_rowap_berry", ROWAP_BERRY)
+    val POTTED_ROWAP_BERRY = this.create("potted_rowap_berry", BlocksInvoker.createFlowerPotBlock(ROWAP_BERRY))
     @JvmField
-    val POTTED_SALAC_BERRY = this.flowerPot("potted_salac_berry", SALAC_BERRY)
+    val POTTED_SALAC_BERRY = this.create("potted_salac_berry", BlocksInvoker.createFlowerPotBlock(SALAC_BERRY))
     @JvmField
-    val POTTED_SHUCA_BERRY = this.flowerPot("potted_shuca_berry", SHUCA_BERRY)
+    val POTTED_SHUCA_BERRY = this.create("potted_shuca_berry", BlocksInvoker.createFlowerPotBlock(SHUCA_BERRY))
     @JvmField
-    val POTTED_SITRUS_BERRY = this.flowerPot("potted_sitrus_berry", SITRUS_BERRY)
+    val POTTED_SITRUS_BERRY = this.create("potted_sitrus_berry", BlocksInvoker.createFlowerPotBlock(SITRUS_BERRY))
     @JvmField
-    val POTTED_SPELON_BERRY = this.flowerPot("potted_spelon_berry", SPELON_BERRY)
+    val POTTED_SPELON_BERRY = this.create("potted_spelon_berry", BlocksInvoker.createFlowerPotBlock(SPELON_BERRY))
     @JvmField
-    val POTTED_STARF_BERRY = this.flowerPot("potted_starf_berry", STARF_BERRY)
+    val POTTED_STARF_BERRY = this.create("potted_starf_berry", BlocksInvoker.createFlowerPotBlock(STARF_BERRY))
     @JvmField
-    val POTTED_TAMATO_BERRY = this.flowerPot("potted_tamato_berry", TAMATO_BERRY)
+    val POTTED_TAMATO_BERRY = this.create("potted_tamato_berry", BlocksInvoker.createFlowerPotBlock(TAMATO_BERRY))
     @JvmField
-    val POTTED_TANGA_BERRY = this.flowerPot("potted_tanga_berry", TANGA_BERRY)
+    val POTTED_TANGA_BERRY = this.create("potted_tanga_berry", BlocksInvoker.createFlowerPotBlock(TANGA_BERRY))
     @JvmField
-    val POTTED_TOUGA_BERRY = this.flowerPot("potted_touga_berry", TOUGA_BERRY)
+    val POTTED_TOUGA_BERRY = this.create("potted_touga_berry", BlocksInvoker.createFlowerPotBlock(TOUGA_BERRY))
     @JvmField
-    val POTTED_WACAN_BERRY = this.flowerPot("potted_wacan_berry", WACAN_BERRY)
+    val POTTED_WACAN_BERRY = this.create("potted_wacan_berry", BlocksInvoker.createFlowerPotBlock(WACAN_BERRY))
     @JvmField
-    val POTTED_WATMEL_BERRY = this.flowerPot("potted_watmel_berry", WATMEL_BERRY)
+    val POTTED_WATMEL_BERRY = this.create("potted_watmel_berry", BlocksInvoker.createFlowerPotBlock(WATMEL_BERRY))
     @JvmField
-    val POTTED_WEPEAR_BERRY = this.flowerPot("potted_wepear_berry", WEPEAR_BERRY)
+    val POTTED_WEPEAR_BERRY = this.create("potted_wepear_berry", BlocksInvoker.createFlowerPotBlock(WEPEAR_BERRY))
     @JvmField
-    val POTTED_WIKI_BERRY = this.flowerPot("potted_wiki_berry", WIKI_BERRY)
+    val POTTED_WIKI_BERRY = this.create("potted_wiki_berry", BlocksInvoker.createFlowerPotBlock(WIKI_BERRY))
     @JvmField
-    val POTTED_YACHE_BERRY = this.flowerPot("potted_yache_berry", YACHE_BERRY)
-    @JvmField
-    val POTTED_PEP_UP_FLOWER = this.flowerPot("potted_pep_up_flower", PEP_UP_FLOWER)
-    @JvmField
-    val POTTED_RED_APRICORN_SAPLING = this.flowerPot("potted_red_apricorn_sapling", RED_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_YELLOW_APRICORN_SAPLING = this.flowerPot("potted_yellow_apricorn_sapling", YELLOW_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_GREEN_APRICORN_SAPLING = this.flowerPot("potted_green_apricorn_sapling", GREEN_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLUE_APRICORN_SAPLING = this.flowerPot("potted_blue_apricorn_sapling", BLUE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_PINK_APRICORN_SAPLING = this.flowerPot("potted_pink_apricorn_sapling", PINK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLACK_APRICORN_SAPLING = this.flowerPot("potted_black_apricorn_sapling", BLACK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_WHITE_APRICORN_SAPLING = this.flowerPot("potted_white_apricorn_sapling", WHITE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_SACCHARINE_SAPLING = this.flowerPot("potted_saccharine_sapling", SACCHARINE_SAPLING)
+    val POTTED_YACHE_BERRY = this.create("potted_yache_berry", BlocksInvoker.createFlowerPotBlock(YACHE_BERRY))
 
     init {
         /**
@@ -1345,16 +1346,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     fun typeGemClusters() = typeGemClusters.toMap()
 
-    private fun flowerPot(name: String, flower: Block) = this.create(
-        name,
-        FlowerPotBlock(
-            flower,
-            BlockBehaviour.Properties.of()
-                .instabreak()
-                .noOcclusion()
-                .pushReaction(PushReaction.DESTROY)
-        )
-    )
+    private fun pottedPlant(name: String, flower: Block) = this.create(name, BlocksInvoker.createFlowerPotBlock(flower))
 
     private fun mintLitter(name: String, color: MapColor) = this.create(
         name,

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

@@ -566,6 +566,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SwapPartyPokemonPacket.ID, SwapPartyPokemonPacket::decode, SwapPartyPokemonHandler))
 
         list.add(PacketRegisterInfo(MovePCPokemonPacket.ID, MovePCPokemonPacket::decode, MovePCPokemonHandler))
+        list.add(PacketRegisterInfo(MovePCPokemonBatchPacket.ID, MovePCPokemonBatchPacket::decode, MovePCPokemonBatchHandler))
         list.add(PacketRegisterInfo(MovePartyPokemonPacket.ID, MovePartyPokemonPacket::decode, MovePartyPokemonHandler))
 
         list.add(PacketRegisterInfo(SwapPCPartyPokemonPacket.ID, SwapPCPartyPokemonPacket::decode, SwapPCPartyPokemonHandler))

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/HateEntityTaskConfig.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
@@ -18,7 +17,6 @@ import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -36,8 +34,6 @@ import net.minecraft.world.entity.ai.sensing.SensorType
 class HateEntityTaskConfig : SingleTaskConfig {
     val entityCondition: Expression = "true".asExpression()
     val range: ExpressionOrEntityVariable = Either.left("24".asExpression())
-    val chance: Float = Cobblemon.config.predationChance
-    private val coercedChance = chance.coerceIn(0f, 1f)
 
     override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
     override fun createTask(
@@ -47,44 +43,24 @@ class HateEntityTaskConfig : SingleTaskConfig {
         val range = range.resolveFloat(behaviourConfigurationContext.runtime)
         behaviourConfigurationContext.addMemories(
             MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
-            MemoryModuleType.ANGRY_AT,
-            MemoryModuleType.ATTACK_TARGET
+            MemoryModuleType.ANGRY_AT
         )
         behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
         return BehaviorBuilder.create { instance ->
             instance.group(
                 instance.present(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES),
-                instance.registered(MemoryModuleType.ANGRY_AT),
-                instance.registered(MemoryModuleType.ATTACK_TARGET),
-            ).apply(instance) { entities, angryAt, attackTarget ->
+                instance.registered(MemoryModuleType.ANGRY_AT)
+            ).apply(instance) { entities, angryAt ->
                 Trigger { world, entity, _ ->
-                    // bail if gamerule is disabled
-                    if (!world.gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_PREDATION)) return@Trigger false
-                    val target = instance.get(entities).findClosest { hated ->
-                        mainThreadRuntime.withQueryValue("entity", hated.asMostSpecificMoLangValue())
+                    val target = instance.get(entities).findClosest {
+                        mainThreadRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                         return@findClosest mainThreadRuntime.resolveBoolean(entityCondition)
                     }.orElse(null)
 
-                    var shouldTrigger = false
                     if (target != null && target.distanceTo(entity) <= range) {
-                        shouldTrigger = when {
-                            // set always attacking if activity chance is equal to 1.0
-                            coercedChance == 1f -> {
-                                angryAt.set(target.uuid)
-                                attackTarget.set(target)
-                                true
-                            }
-                            // roll the dice in other way
-                            coercedChance != 1f && world.random.nextFloat() < coercedChance -> {
-                                angryAt.set(target.uuid)
-                                attackTarget.set(target)
-                                true
-                            }
-                            // fallback to peaceful behavior in unattended cases
-                            else -> false
-                        }
+                        angryAt.set(target.uuid)
                     }
-                    return@Trigger shouldTrigger
+                    return@Trigger true
                 }
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEvolutionDisplay.kt

@@ -88,7 +88,7 @@ fun getToolTipHeaderIcon(tradeEvolution: TradeEvolution): CobblemonDexEvolutionR
         lang("ui.pokedex.evolution.trade.tooltip.with_any_species")
     } else {
         PokemonSpecies.getByIdentifier(species.asIdentifierDefaultingNamespace())
-            ?.let { lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.plainCopy().green()) }
+            ?.let { lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.green()) }
             ?: lang("ui.pokedex.evolution.trade.tooltip.with_any_species")
     }
     return CobblemonDexEvolutionRequirementDisplay(CobblemonItems.LINK_CABLE, tooltip)
@@ -282,7 +282,7 @@ fun buildLevelRequirement(levelRequirement: LevelRequirement): DexEvolutionRequi
 
 fun buildMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): DexEvolutionRequirementDisplay {
     val icon = Items.CLOCK
-    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().plainCopy().green()
+    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().green()
     val tooltip = lang("ui.pokedex.requirement.moon_phase.tooltip", moonPhaseComponent)
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
@@ -290,7 +290,7 @@ fun buildMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): DexEv
 
 fun buildMoveSetRequirement(moveSetRequirement: MoveSetRequirement): DexEvolutionRequirementDisplay {
     val icon = CobblemonItems.TECHNICAL_MACHINE
-    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }
@@ -319,7 +319,7 @@ fun buildMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): DexEvolu
         else -> CobblemonItems.NORMAL_GEM
     }
 
-    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }
@@ -437,7 +437,7 @@ fun buildStructureRequirement(structureRequirement: StructureRequirement, negate
 
 fun buildTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): DexEvolutionRequirementDisplay? {
     val icon = Items.CLOCK
-    val timeRangeComponent = timeRangeRequirement.range.displayName()?.plainCopy() ?: return null
+    val timeRangeComponent = timeRangeRequirement.range.displayName() ?: return null
     val tooltip = lang("ui.pokedex.requirement.time_range.tooltip", timeRangeComponent.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
@@ -445,7 +445,7 @@ fun buildTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): DexEv
 
 fun buildUseMoveRequirement(useMoveRequirement: UseMoveRequirement): DexEvolutionRequirementDisplay {
     val icon = CobblemonItems.CHOICE_BAND
-    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/AreaSpawningCondition.kt

@@ -42,8 +42,8 @@ abstract class AreaTypeSpawningCondition<T : AreaSpawnablePosition> : SpawningCo
     override fun copyFrom(other: SpawningCondition<*>, merger: Merger) {
         super.copyFrom(other, merger)
         if (other is AreaTypeSpawningCondition) {
-            minHeight = merger.mergeSingle(minHeight, other.minHeight)
-            maxHeight = merger.mergeSingle(maxHeight, other.maxHeight)
+            merger.mergeSingle(minHeight, other.minHeight)
+            merger.mergeSingle(maxHeight, other.maxHeight)
             neededNearbyBlocks = merger.merge(neededNearbyBlocks, other.neededNearbyBlocks)?.toMutableList()
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SubmergedSpawningCondition.kt

@@ -46,7 +46,7 @@ abstract class SubmergedTypeSpawningCondition<T : SubmergedSpawnablePosition> :
         super.copyFrom(other, merger)
         if (other is SubmergedTypeSpawningCondition) {
             minDepth = merger.mergeSingle(minDepth, other.minDepth)
-            maxDepth = merger.mergeSingle(maxDepth, other.maxDepth)
+            maxDepth = merger.mergeSingle(minDepth, other.minDepth)
             fluidIsSource = merger.mergeSingle(fluidIsSource, other.fluidIsSource)
             fluid = merger.mergeSingle(fluid, other.fluid)
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SurfaceSpawningCondition.kt

@@ -39,7 +39,7 @@ abstract class SurfaceTypeSpawningCondition<T : SurfaceSpawnablePosition> : Area
         super.copyFrom(other, merger)
         if (other is SurfaceTypeSpawningCondition) {
             minDepth = merger.mergeSingle(minDepth, other.minDepth)
-            maxDepth = merger.mergeSingle(maxDepth, other.maxDepth)
+            maxDepth = merger.mergeSingle(minDepth, other.minDepth)
             fluid = merger.mergeSingle(fluid, other.fluid)
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt

@@ -29,6 +29,7 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacke
 import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.asTranslated
@@ -270,6 +271,34 @@ open class PCStore(
         }
     }
 
+    fun moveBatch(moves: List<Triple<UUID, PCPosition, PCPosition>>): Boolean {
+        if (moves.isEmpty() || moves.size > MovePCPokemonBatchPacket.MAX_MOVES) return false
+        if (moves.map { it.second }.toSet().size != moves.size ||
+            moves.map { it.third }.toSet().size != moves.size ||
+            moves.map { it.first }.toSet().size != moves.size
+        ) return false
+        if (moves.any { (_, source, target) -> !isValidPosition(source) || !isValidPosition(target) }) return false
+
+        val sourcePositions = moves.mapTo(mutableSetOf()) { it.second }
+        val pokemonMoves = moves.map { (pokemonID, source, target) ->
+            val pokemon = get(source)?.takeIf { it.uuid == pokemonID } ?: return false
+            Triple(source, target, pokemon)
+        }
+        if (pokemonMoves.any { (_, target, _) -> get(target) != null && target !in sourcePositions }) return false
+
+        pokemonMoves.forEach { (source, _, _) -> setAtPosition(source, null) }
+        pokemonMoves.forEach { (_, target, pokemon) -> setAtPosition(target, pokemon) }
+
+        pokemonMoves.forEach { (_, _, pokemon) ->
+            sendPacketToObservers(RemoveClientPokemonPacket(this, pokemon.uuid))
+        }
+        pokemonMoves.forEach { (_, target, pokemon) ->
+            sendPacketToObservers(SetPCPokemonPacket(uuid, target) { pokemon })
+        }
+        pcChangeObservable.emit(Unit)
+        return true
+    }
+
     override fun loadPositionFromNBT(nbt: CompoundTag): StoreCoordinates<PCPosition> {
         return StoreCoordinates(this, PCPosition(nbt.getShort(DataKeys.STORE_BOX).toInt(), nbt.getByte(DataKeys.STORE_SLOT).toInt()))
     }

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

@@ -85,7 +85,6 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             if (HidePartyBinding.shouldHide) {
                 return false
             }
-
             return true
         }
     }
@@ -559,4 +558,4 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/BoxStorageSlot.kt

@@ -29,7 +29,8 @@ class BoxStorageSlot(
 
         val grabbedSlot = parent.grabbedSlot
         return if (grabbedSlot == null) {
-            true
+            val pokemon = getPokemon()
+            pokemon == null || !parent.isInMultiSelection(pokemon, position)
         } else {
             grabbedSlot.getPokemon() != getPokemon()
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt

@@ -50,6 +50,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import kotlin.isInitialized
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.FastColor
 
 class PCGUI(
     val pc: ClientPC,
@@ -129,6 +130,55 @@ class PCGUI(
     var selectPointerOffsetIncrement = false
     var displayOptions = false
 
+    private var dragStartX: Int? = null
+    private var dragStartY: Int? = null
+    private var dragEndX: Int? = null
+    private var dragEndY: Int? = null
+    private var selectionDragActive = false
+
+    data class SelectionArea(val left: Int, val top: Int, val right: Int, val bottom: Int)
+
+    private data class BoxGridBounds(val left: Int, val top: Int, val right: Int, val bottom: Int) {
+        fun contains(x: Int, y: Int) = x in left..< right && y >= top && y < bottom
+    }
+
+    private fun getBoxGridBounds(): BoxGridBounds {
+        val left = storageWidget.x
+        val top = storageWidget.y
+        return BoxGridBounds(
+            left,
+            top,
+            left + StorageWidget.SCREEN_WIDTH,
+            top + StorageWidget.SCREEN_HEIGHT
+        )
+    }
+
+    fun getSelectionArea(): SelectionArea? {
+        if (!selectionDragActive) return null
+        val startX = dragStartX ?: return null
+        val startY = dragStartY ?: return null
+        val endX = dragEndX ?: return null
+        val endY = dragEndY ?: return null
+        val bounds = getBoxGridBounds()
+        if (!bounds.contains(startX, startY)) return null
+
+        val columns = 6
+        val rows = 5
+        val slotPitch = StorageSlot.SIZE + StorageWidget.BOX_SLOT_PADDING
+        val gridLeft = bounds.left + StorageWidget.BOX_SLOT_START_OFFSET_X
+        val gridTop = bounds.top + StorageWidget.BOX_SLOT_START_OFFSET_Y + if (displayOptions) 5 else 0
+        val startColumn = ((startX - gridLeft) / slotPitch).coerceIn(0, columns - 1)
+        val endColumn = (((endX.coerceIn(bounds.left, bounds.right - 1)) - gridLeft) / slotPitch).coerceIn(0, columns - 1)
+        val startRow = ((startY - gridTop) / slotPitch).coerceIn(0, rows - 1)
+        val endRow = (((endY.coerceIn(bounds.top, bounds.bottom - 1)) - gridTop) / slotPitch).coerceIn(0, rows - 1)
+        return SelectionArea(
+            gridLeft + minOf(startColumn, endColumn) * slotPitch, // left
+            gridTop + minOf(startRow, endRow) * slotPitch, // top
+            gridLeft + (maxOf(startColumn, endColumn) * slotPitch) + StorageSlot.SIZE, // right
+            gridTop + (maxOf(startRow, endRow) * slotPitch) + StorageSlot.SIZE // bottom
+        )
+    }
+
     override fun renderBlurredBackground(delta: Float) {}
 
     override fun renderMenuBackground(context: GuiGraphics) {}
@@ -250,7 +300,7 @@ class PCGUI(
                 configuration.showParty = isVisible
                 wallpaperWidget.visible = !isVisible
                 (it as IconButton).highlighted = !isVisible
-                if (!unseenWallpapers.isEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
+                if (unseenWallpapers.isNotEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
             }.also {
                 it.visible = displayOptions
                 optionButtons.add(it)
@@ -315,6 +365,20 @@ class PCGUI(
         super.init()
     }
 
+    private fun renderSelectionBox(context: GuiGraphics, area: SelectionArea) {
+        context.pose().pushPose()
+        context.pose().translate(0.0, 0.0, 1500.0)
+        val borderColor = FastColor.ARGB32.color(255, 205, 212, 255)
+        val bgColor = FastColor.ARGB32.color(75, 133, 183, 230)
+        val thickness = 1
+        context.fill(area.left, area.top, area.right, area.bottom, bgColor)
+        context.fill(area.left, area.top, area.right, area.top + thickness, borderColor)
+        context.fill(area.left, area.bottom - thickness, area.right, area.bottom, borderColor)
+        context.fill(area.left, area.top, area.left + thickness, area.bottom, borderColor)
+        context.fill(area.right - thickness, area.top, area.right, area.bottom, borderColor)
+        context.pose().popPose()
+    }
+
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         renderBackground(context, mouseX, mouseY, delta)
@@ -685,12 +749,14 @@ class PCGUI(
             scale = SCALE
         )
 
-        if (!optionButtons.isEmpty() && displayOptions) {
+        if (optionButtons.isNotEmpty() && displayOptions) {
             for (button in optionButtons) button.showAlt = hasShiftDown()
         }
 
         super.render(context, mouseX, mouseY, delta)
 
+        getSelectionArea()?.let { renderSelectionBox(context, it) }
+
         // Item Tooltip
         if (pokemon != null) {
             val displayedItem = if (showCosmeticItem) pokemon.cosmeticItem else pokemon.heldItemNoCopy()
@@ -712,6 +778,20 @@ class PCGUI(
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        storageWidget.clearPendingStorageSlotClick()
+        selectionDragActive = false
+        val clickX = mouseX.toInt()
+        val clickY = mouseY.toInt()
+        if (storageWidget.multiSelection == null && button == 0 &&
+            getBoxGridBounds().contains(clickX, clickY) &&
+            storageWidget.pastureWidget == null) {
+            dragStartX = clickX
+            dragStartY = clickY
+        } else {
+            dragStartX = null
+            dragStartY = null
+        }
+
         // Trigger child component function as they will need to check the entire screen click area
         if (::boxNameWidget.isInitialized) boxNameWidget.mouseClicked(mouseX, mouseY, button)
         return super.mouseClicked(mouseX, mouseY, button)
@@ -740,9 +820,43 @@ class PCGUI(
         storageWidget.pastureWidget?.let { pasture ->
             if (pasture.pastureScrollList.isHovered) pasture.pastureScrollList.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
         }
+        if (button == 0 && storageWidget.pastureWidget == null) {
+            val startX = dragStartX
+            val startY = dragStartY
+            if (startX != null && startY != null) {
+                val offsetX = mouseX - startX
+                val offsetY = mouseY - startY
+                if (offsetX * offsetX + offsetY * offsetY >= 25.0) {
+                    selectionDragActive = true
+                    storageWidget.clearPendingStorageSlotClick()
+                    dragEndX = mouseX.toInt()
+                    dragEndY = mouseY.toInt()
+                }
+            }
+        }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
     }
 
+    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        val handled = super.mouseReleased(mouseX, mouseY, button)
+        if (button == 0) {
+            if (selectionDragActive) {
+                dragEndX = mouseX.toInt()
+                dragEndY = mouseY.toInt()
+                storageWidget.updateSelection()
+                storageWidget.clearPendingStorageSlotClick()
+            } else {
+                storageWidget.completePendingStorageSlotClick(mouseX, mouseY)
+            }
+        }
+        dragStartX = null
+        dragStartY = null
+        dragEndX = null
+        dragEndY = null
+        selectionDragActive = false
+        return handled
+    }
+
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
         val boxNameFocused = this::boxNameWidget.isInitialized && boxNameWidget.isFocused
         val filterFocused = this::filterWidget.isInitialized && filterWidget.isFocused

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCMultiSelection.kt

@@ -0,0 +1,37 @@
+package com.cobblemon.mod.common.client.gui.pc
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+data class PCMultiSelection(
+    private val grid: MutableList<MutableList<Pokemon?>> = mutableListOf(),
+    val sourceBox: Int = 0,
+    val sourceColumn: Int = 0,
+    val sourceRow: Int = 0
+) {
+    fun getHorizontalSize(): Int = grid.firstOrNull()?.size ?: 0
+    fun getVerticalSize(): Int = grid.size
+
+    constructor(horizontalSize: Int, verticalSize: Int, sourceBox: Int, sourceColumn: Int, sourceRow: Int) : this(
+        MutableList(verticalSize) { MutableList<Pokemon?>(horizontalSize) { null } },
+        sourceBox,
+        sourceColumn,
+        sourceRow
+    )
+
+    fun getPokemon(x: Int, y: Int): Pokemon? {
+        return grid[y][x]
+    }
+
+    fun setPokemon(x: Int, y: Int, pokemon: Pokemon?) {
+        grid[y][x] = pokemon
+    }
+
+    fun pokemonEntries(): List<Triple<Int, Int, Pokemon>> {
+        return grid.flatMapIndexed { y, row ->
+            row.mapIndexedNotNull { x, pokemon -> pokemon?.let { Triple(x, y, it) } }
+        }
+    }
+
+    fun getPokemonCount(): Int = pokemonEntries().size
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/ReleaseButton.kt

@@ -45,11 +45,13 @@ class ReleaseButton(
                 vOffset = if (isHovered(mouseX.toDouble(), mouseY.toDouble())) HEIGHT else 0,
                 textureHeight = HEIGHT * 2
             )
+            val pokemonCount = parent.multiSelection?.getPokemonCount() ?: 0
 
             drawScaledText(
                 context = context,
                 font = CobblemonResources.DEFAULT_LARGE,
-                text = lang("ui.pc.release").bold(),
+                text = if (pokemonCount > 1)
+                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
                 x = x + (WIDTH / 2),
                 y = y + 3.5,
                 centered = true,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.pc
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
@@ -54,9 +55,17 @@ open class StorageSlot(
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        val selectionArea = parent.pcGui.getSelectionArea()
+        if (selectionArea != null && parent.getSelectedPokemon(selectionArea).contains(this)) {
+            val highlightColor = 0x40FFFFFF
+            context.fill(x + 1, y, x + (SIZE - 1), y + SIZE, highlightColor)
+            context.fill(x, y + 1, x + 1, y + (SIZE - 1), highlightColor)
+            context.fill(x + SIZE - 1, y + 1, x + SIZE, y + (SIZE - 1), highlightColor)
+        }
         if (shouldRender()) {
             renderSlot(context, x, y, delta)
         }
+
     }
 
     fun renderSlot(context: GuiGraphics, posX: Int, posY: Int, partialTicks: Float) {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageWidget.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.gui.pc
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.storage.StorePosition
 import com.cobblemon.mod.common.api.storage.party.PartyPosition
 import com.cobblemon.mod.common.api.storage.pc.PCPosition
 import com.cobblemon.mod.common.api.text.bold
@@ -39,8 +38,9 @@ import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
+import java.util.UUID
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket.PCPokemonMove
 
 class StorageWidget(
     pX: Int, pY: Int,
@@ -77,9 +77,13 @@ class StorageWidget(
 
     var displayConfirmRelease = false
     var screenLoaded = false
-    var selectedPosition: StorePosition? = null
+    var selectedPosition: PartyPosition? = null
     var grabbedSlot: GrabbedStorageSlot? = null
 
+    var multiSelection: PCMultiSelection? = null
+    private val multiGrabbedSlots = mutableMapOf<UUID, GrabbedStorageSlot>()
+    private var pendingStorageSlotClick: Button? = null
+
     var box = 0
         set(value) {
             field =
@@ -113,16 +117,22 @@ class StorageWidget(
             subKey = "ui.generic.yes",
             onPress = {
                 if (canDeleteSelected() && displayConfirmRelease) {
-                    val position = selectedPosition ?: return@ReleaseConfirmButton
-                    val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
+                    val selection = multiSelection
+                    if (selection != null) {
+                        selection.pokemonEntries().forEach { (column, row, pokemon) ->
+                            val position = PCPosition(
+                                selection.sourceBox,
+                                (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                            )
+                            CobblemonNetwork.sendToServer(ReleasePCPokemonPacket(pokemon.uuid, position))
+                        }
+                    } else {
+                        val position = selectedPosition ?: return@ReleaseConfirmButton
+                        val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
 
-                    val packet = when (position) {
-                        is PartyPosition -> ReleasePartyPokemonPacket(pokemon.uuid, position)
-                        is PCPosition -> ReleasePCPokemonPacket(pokemon.uuid, position)
-                        else -> return@ReleaseConfirmButton
+                        CobblemonNetwork.sendToServer(ReleasePartyPokemonPacket(pokemon.uuid, position))
                     }
 
-                    CobblemonNetwork.sendToServer(packet)
                     playSound(CobblemonSounds.PC_RELEASE)
                     resetSelected()
                     displayConfirmRelease = false
@@ -149,9 +159,8 @@ class StorageWidget(
     }
 
     fun canDeleteSelected(): Boolean {
-        return !(selectedPosition is PartyPosition && party.filterNotNull().size <= 1)
-                && selectedPosition != null
-                && grabbedSlot != null
+        multiSelection?.let { return it.pokemonEntries().isNotEmpty() }
+        return party.filterNotNull().size > 1 && selectedPosition != null && grabbedSlot != null
     }
 
     fun setupStorageSlots() {
@@ -170,7 +179,7 @@ class StorageWidget(
                     parent = this,
                     pc = pc,
                     position = PCPosition(box, index),
-                    onPress = { this.onStorageSlotClicked(it) }
+                    onPress = { pendingStorageSlotClick = it }
                 ).also {  widget ->
                     this.addWidget(widget)
                     this.boxSlots.add(widget)
@@ -200,7 +209,7 @@ class StorageWidget(
                 parent = this,
                 party = party,
                 position = PartyPosition(partyIndex),
-                onPress = { this.onStorageSlotClicked(it) }
+                onPress = { pendingStorageSlotClick = it }
             ).also { widget ->
                 this.addWidget(widget)
                 this.partySlots.add(widget)
@@ -210,13 +219,115 @@ class StorageWidget(
 
     private fun getSelectedPokemon(): Pokemon? {
         val selectedPosition = this.selectedPosition ?: return null
-        return when (selectedPosition) {
-            is PCPosition -> pc.get(selectedPosition)
-            is PartyPosition -> party.get(selectedPosition)
-            else -> null
+        return party.get(selectedPosition)
+    }
+
+    fun getSelectedPokemon(area: PCGUI.SelectionArea): List<BoxStorageSlot> {
+        return boxSlots.filter { slot ->
+            slot.x < area.right && slot.x + StorageSlot.SIZE > area.left &&
+                slot.y < area.bottom && slot.y + StorageSlot.SIZE > area.top &&
+                slot.getPokemon()?.let(pcGui.search::passes) == true
         }
     }
 
+    fun clearPendingStorageSlotClick() {
+        pendingStorageSlotClick = null
+    }
+
+    fun completePendingStorageSlotClick(mouseX: Double, mouseY: Double) {
+        val button = pendingStorageSlotClick ?: return
+        pendingStorageSlotClick = null
+        if (button.isMouseOver(mouseX, mouseY)) {
+            onStorageSlotClicked(button)
+        }
+    }
+
+    fun updateSelection() {
+        val area = pcGui.getSelectionArea()
+        if (area == null) {
+            multiSelection = null
+            return
+        }
+
+        selectedPosition = null
+        grabbedSlot = null
+        pcGui.setPreviewPokemon(null)
+
+        val selectedSlots = getSelectedPokemon(area)
+        if (selectedSlots.isEmpty()) {
+            multiSelection = null
+            return
+        }
+
+        val minColumn = selectedSlots.minOf { it.position.slot % 6 }
+        val maxColumn = selectedSlots.maxOf { it.position.slot % 6 }
+        val minRow = selectedSlots.minOf { it.position.slot / 6 }
+        val maxRow = selectedSlots.maxOf { it.position.slot / 6 }
+        val selection = PCMultiSelection(maxColumn - minColumn + 1, maxRow - minRow + 1, box, minColumn, minRow)
+
+        selectedSlots.forEach { slot ->
+            val pokemon = slot.getPokemon() ?: return@forEach
+            val slotIndex = slot.position.slot
+            val column = slotIndex % 6
+            val row = slotIndex / 6
+            if (column in minColumn..maxColumn && row in minRow..maxRow) {
+                selection.setPokemon(column - minColumn, row - minRow, pokemon)
+            }
+        }
+        playSound(CobblemonSounds.PC_GRAB)
+
+        multiSelection = selection
+    }
+
+    private fun moveMultiSelectionTo(destination: PCPosition): Boolean {
+        val selection = multiSelection ?: return false
+
+        val width = selection.getHorizontalSize()
+        val height = selection.getVerticalSize()
+        val destinationColumn = destination.slot % 6
+        val destinationRow = destination.slot / 6
+        if (destinationColumn + width > 6 || destinationRow + height > 5) return false
+
+        val moves = mutableListOf<PCPokemonMove>()
+        val selectedSources = mutableSetOf<PCPosition>()
+        for (row in 0 until height) {
+            for (column in 0 until width) {
+                val pokemon = selection.getPokemon(column, row) ?: continue
+                val source = PCPosition(selection.sourceBox, (selection.sourceRow + row) * 6 + selection.sourceColumn + column)
+                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
+                selectedSources.add(source)
+                moves.add(PCPokemonMove(pokemon.uuid, source, target))
+            }
+        }
+
+        if (moves.isEmpty()) return false
+
+        for (row in 0 until height) {
+            for (column in 0 until width) {
+                if (selection.getPokemon(column, row) == null) continue
+                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
+                val displacedPokemon = pc.get(target) ?: continue
+                if (target in selectedSources) continue
+
+                val displacedSource = PCPosition(
+                    selection.sourceBox,
+                    (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                )
+                if (pc.get(displacedSource) != null && displacedSource !in selectedSources) return false
+                moves.add(PCPokemonMove(displacedPokemon.uuid, target, displacedSource))
+            }
+        }
+
+        if (moves.map { it.newPosition }.toSet().size != moves.size) return false
+        MovePCPokemonBatchPacket(moves).sendToServer()
+        return true
+    }
+
+    fun isInMultiSelection(pokemon: Pokemon, position: PCPosition): Boolean {
+        val selection = multiSelection ?: return false
+        return selection.sourceBox == position.box && selection.pokemonEntries().any { it.third == pokemon }
+    }
+
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         // Party  Label
@@ -240,11 +351,14 @@ class StorageWidget(
                 shadow = true
             )
 
+            val pokemonCount = multiSelection?.getPokemonCount() ?: 0
+
             if (canDeleteSelected() && displayConfirmRelease) {
                 drawScaledText(
                     context = context,
                     font = CobblemonResources.DEFAULT_LARGE,
-                    text = lang("ui.pc.release").bold(),
+                    text = if (pokemonCount > 1)
+                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
                     x = x + 223,
                     y = y + 119,
                     centered = true
@@ -308,6 +422,7 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
+                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: false)
@@ -324,6 +439,7 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
+                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: true)
@@ -335,10 +451,31 @@ class StorageWidget(
         pastureWidget?.render(context, mouseX, mouseY, delta)
         matrices.pushPose()
         matrices.translate(0.0, 0.0, 1000.0)
-        grabbedSlot?.render(context, mouseX, mouseY, delta)
+        renderSelectedPokemon(context, mouseX, mouseY, delta)
         matrices.popPose()
     }
 
+    private fun renderSelectedPokemon(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        val selection = multiSelection
+        if (selection == null) {
+            grabbedSlot?.render(context, mouseX, mouseY, delta)
+            return
+        }
+
+        val slotOffset = StorageSlot.SIZE + BOX_SLOT_PADDING
+        selection.pokemonEntries().forEach { (column, row, pokemon) ->
+            val grabbed = multiGrabbedSlots.getOrPut(pokemon.uuid) {
+                GrabbedStorageSlot(0, 0, this, pokemon)
+            }
+            grabbed.render(
+                context,
+                mouseX + column * slotOffset,
+                mouseY + row * slotOffset,
+                delta
+            )
+        }
+    }
+
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
         if (displayConfirmRelease) {
             if (releaseYesButton.isHovered(pMouseX, pMouseY)) releaseYesButton.mouseClicked(pMouseX, pMouseY, pButton)
@@ -371,23 +508,55 @@ class StorageWidget(
             else -> return
         }
 
+        val clickedPokemon = when (clickedPosition) {
+            is PCPosition -> pc.get(clickedPosition)
+            is PartyPosition -> party.get(clickedPosition)
+            else -> null
+        }
+
+        multiSelection?.let { selection ->
+            when (clickedPosition) {
+                is PCPosition -> {
+                    if (clickedPosition.box == selection.sourceBox &&
+                        clickedPosition.slot == selection.sourceRow * 6 + selection.sourceColumn
+                    ) {
+                        resetSelected()
+                    } else if (moveMultiSelectionTo(clickedPosition)) {
+                        playSound(CobblemonSounds.PC_DROP)
+                        resetSelected()
+                    }
+                }
+                is PartyPosition -> {
+                    val selectedPokemon = selection.pokemonEntries().singleOrNull() ?: return
+                    val (column, row, pokemon) = selectedPokemon
+                    val source = PCPosition(
+                        selection.sourceBox,
+                        (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                    )
+                    if (pc.get(source) !== pokemon) return
+                    val packet = clickedPokemon?.let {
+                        SwapPCPartyPokemonPacket(it.uuid, clickedPosition, pokemon.uuid, source)
+                    } ?: MovePCPokemonToPartyPacket(pokemon.uuid, source, clickedPosition)
+                    packet.sendToServer()
+                    playSound(CobblemonSounds.PC_DROP)
+                    resetSelected()
+                }
+                else -> Unit
+            }
+            return
+        }
+
         // Reset release confirmation
         displayConfirmRelease = false
 
         // Clicking on itself, so unselect position
-        if (this.selectedPosition != null && this.selectedPosition == clickedPosition) {
+        if (selectedPosition == clickedPosition) {
             if (grabbedSlot != null) playSound(CobblemonSounds.PC_DROP)
             resetSelected()
             return
         }
 
         // Check for selecting a Pokémon
-        val clickedPokemon = when(button) {
-            is BoxStorageSlot -> pc.get(clickedPosition as PCPosition)
-            is PartyStorageSlot -> party.get(clickedPosition as PartyPosition)
-            else -> null
-        }
-
         val selectOverride = pcGui.configuration.selectOverride
         if (selectOverride != null) {
             selectOverride(pcGui, clickedPosition, clickedPokemon)
@@ -420,56 +589,44 @@ class StorageWidget(
                     }
                 }
 
-                this.selectedPosition = clickedPosition
-                this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
-                grabbedSlot = GrabbedStorageSlot(
-                    x = button.x,
-                    y = button.y,
-                    parent = this,
-                    pokemon = clickedPokemon
-                )
-                playSound(CobblemonSounds.PC_GRAB)
-
+                if (clickedPosition is PCPosition) {
+                    val column = clickedPosition.slot % 6
+                    val row = clickedPosition.slot / 6
+                    multiSelection = PCMultiSelection(1, 1, clickedPosition.box, column, row).also {
+                        it.setPokemon(0, 0, clickedPokemon)
+                    }
+                    playSound(CobblemonSounds.PC_GRAB)
+                    return
+                } else if (clickedPosition is PartyPosition) {
+                    this.selectedPosition = clickedPosition
+                    this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
+                    grabbedSlot = GrabbedStorageSlot(
+                        x = button.x,
+                        y = button.y,
+                        parent = this,
+                        pokemon = clickedPokemon
+                    )
+                    playSound(CobblemonSounds.PC_GRAB)
+                }
             }
         } else  {
-            // Handle movement within the Box
-            val selectedPokemon = when(this.selectedPosition) {
-                is PCPosition -> pc.get(this.selectedPosition as PCPosition)
-                is PartyPosition -> party.get(this.selectedPosition as PartyPosition)
-                else -> null
-            } ?: return
-
-            // Box to Box
-            if (this.selectedPosition is PCPosition && clickedPosition is PCPosition) {
-                val packet = clickedPokemon?.let { SwapPCPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
-                    ?: MovePCPokemonPacket(selectedPokemon.uuid, selectedPosition as PCPosition, clickedPosition)
-                packet.sendToServer()
-                playSound(CobblemonSounds.PC_DROP)
-                resetSelected()
-            }
-            // Box to Party
-            else if (this.selectedPosition is PCPosition && clickedPosition is PartyPosition) {
-                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(clickedPokemon.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
-                    ?: MovePCPokemonToPartyPacket(selectedPokemon.uuid, this.selectedPosition as PCPosition, clickedPosition)
-                packet.sendToServer()
-                playSound(CobblemonSounds.PC_DROP)
-                resetSelected()
-            }
+            val sourcePosition = selectedPosition ?: return
+            val selectedPokemon = party.get(sourcePosition) ?: return
             // Party to Box
-            else if (this.selectedPosition is PartyPosition && clickedPosition is PCPosition) {
+            if (clickedPosition is PCPosition) {
                 if (ServerSettings.preventCompletePartyDeposit && this.party.filterNotNull().size == 1 && clickedPokemon == null) {
                     return
                 }
-                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPokemon.uuid, clickedPosition) }
-                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPosition)
+                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPokemon.uuid, clickedPosition) }
+                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
                 resetSelected()
             }
             // Party to Party
-            else if (this.selectedPosition is PartyPosition && clickedPosition is PartyPosition) {
-                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PartyPosition) }
-                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, selectedPosition as PartyPosition, clickedPosition)
+            else if (clickedPosition is PartyPosition) {
+                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, sourcePosition) }
+                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
                 resetSelected()
@@ -480,6 +637,8 @@ class StorageWidget(
     fun resetSelected() {
         selectedPosition = null
         grabbedSlot = null
+        multiSelection = null
+        multiGrabbedSlots.clear()
         pcGui.setPreviewPokemon(null)
     }
 }

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

@@ -34,7 +34,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animatio
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.QuirkData
-import com.cobblemon.mod.common.client.sound.instances.UIEntitySoundInstance
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -45,6 +44,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException
 import java.util.concurrent.ConcurrentLinkedQueue
 import net.minecraft.client.Minecraft
 import net.minecraft.client.multiplayer.ClientLevel
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.commands.arguments.item.ItemParser
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.world.entity.Entity
@@ -289,7 +289,7 @@ abstract class PosableState : Schedulable {
                         entity.level().playLocalSound(entity, soundEvent, entity.soundSource, volume, pitch)
                     }
                 } else {
-                    Minecraft.getInstance().soundManager.play(UIEntitySoundInstance(soundEvent, volume, pitch))
+                    Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, volume, pitch))
                 }
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.sound.instances.AlphaCrySoundInstance
-import com.cobblemon.mod.common.client.sound.instances.UIEntitySoundInstance
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.effectiveName
 import com.cobblemon.mod.common.util.genericRuntime
@@ -32,6 +31,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.client.resources.sounds.EntityBoundSoundInstance
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.world.entity.Entity
@@ -121,7 +121,7 @@ class BedrockSoundKeyframe(
                     }
                 }
             } else {
-                Minecraft.getInstance().soundManager.play(UIEntitySoundInstance(soundEvent))
+                Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1F, 1F))
             }
         }
     }

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

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -29,8 +28,6 @@ class MasquerainModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame
     lateinit var walk: Pose
     lateinit var standing: Pose
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('masquerain', 'cry')".asExpressionLike()
-
         val blink = quirk { bedrockStateful("masquerain", "blink") }
         standing = registerPose(
             poseName = "standing",

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

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.isInWater
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
@@ -37,8 +36,6 @@ class SurskitModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     val wateroffset = -8
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('surskit', 'cry')".asExpressionLike()
-
         val blink = quirk { bedrockStateful("surskit", "blink") }
         standing = registerPose(
             poseName = "standing",

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -37,8 +36,6 @@ class CombeeModel (root: ModelPart) : PokemonPosableModel(root) {
     val shoulderZOffset = 8
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('combee', 'cry')".asExpressionLike()
-
         val blink1 = quirk { bedrockStateful("combee", "blink_right") }
         val blink2 = quirk { bedrockStateful("combee", "blink_gender") }
         val blink3 = quirk { bedrockStateful("combee", "blink_left") }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -31,8 +30,6 @@ class VespiquenModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var standing: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('vespiquen', 'cry')".asExpressionLike()
-
         val blink1 = quirk { bedrockStateful("vespiquen", "blink") }
         val wingsleep = quirk { bedrockStateful("vespiquen", "sleep_flap") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt

@@ -0,0 +1,62 @@
+/*
+ * 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.gen5
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SerperiorModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("serperior")
+    override val head = getPart("head_ai")
+
+    override var portraitScale = 2.5F
+    override var portraitTranslation = Vec3(-0.3, 1.25, 0.0)
+
+    override var profileScale = 0.6F
+    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("serperior", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("serperior", "blink") }
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("serperior", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("serperior", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("serperior", "ground_walk")
+            )
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt

@@ -0,0 +1,70 @@
+/*
+ * 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.gen5
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ServineModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("servine")
+    override val head = getPart("head_ai")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftLeg = getPart("leg_left")
+
+    override var portraitScale = 2.6F
+    override var portraitTranslation = Vec3(-0.15, 0.75, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("servine", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("servine", "blink") }
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            animations = arrayOf(bedrock("servine", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("servine", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walking",
+            poseTypes =  PoseType.MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("servine", "ground_walk")
+            )
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt

@@ -0,0 +1,70 @@
+/*
+ * 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.gen5
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SnivyModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("snivy")
+    override val head = getPart("head_ai")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftLeg = getPart("leg_left")
+
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3(-0.15, 0.32, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("snivy", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("snivy", "blink") }
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            animations = arrayOf(bedrock("snivy", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("snivy", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walking",
+            poseTypes =  PoseType.MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("snivy", "ground_walk")
+            )
+        )
+    }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class GourgeistModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("gourgeist")
+    override val head = getPart("head")
+
+    override var portraitScale = 4.0F
+    override var portraitTranslation = Vec3(-0.1, 0.6, 0.0)
+
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var hovering: Pose
+    lateinit var fly: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("gourgeist", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("gourgeist", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("gourgeist", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseType = PoseType.WALK,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "ground_walk")
+            )
+        )
+
+        hovering = registerPose(
+            poseName = "hovering",
+            poseType = PoseType.HOVER,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "air_idle")
+            )
+        )
+
+        fly = registerPose(
+            poseName = "fly",
+            poseType = PoseType.FLY,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "air_fly")
+            )
+        )
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "sleep")
+            )
+        )
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * 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.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class PumpkabooModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("pumpkaboo")
+    override val head = getPart("head")
+
+    override var portraitScale = 3.5F
+    override var portraitTranslation = Vec3(0.0, -1.5, 0.0)
+
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3(0.0, 0.25, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+    lateinit var battleidle: CobblemonPose
+    lateinit var sleep: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("pumpkaboo", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("pumpkaboo", "blink") }
+        val quirk = quirk { bedrockStateful("pumpkaboo", "quirk_idle") }
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "sleep")
+            )
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink, quirk),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pumpkaboo", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "ground_walk")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battleidle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "battle_idle")
+            )
+        )
+    }
+}

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

@@ -322,6 +322,8 @@ object VaryingModelRepository {
         inbuilt("loudred", :: LoudredModel)
         inbuilt("exploud", :: ExploudModel)
         inbuilt("cryogonal", :: CryogonalModel)
+        inbuilt("pumpkaboo", :: PumpkabooModel)
+        inbuilt("gourgeist", :: GourgeistModel)
         inbuilt("eiscue", :: EiscueModel)
         inbuilt("wooloo", :: WoolooModel)
         inbuilt("dubwool", :: DubwoolModel)
@@ -338,6 +340,9 @@ object VaryingModelRepository {
         inbuilt("thwackey", ::ThwackeyModel)
         inbuilt("rillaboom", ::RillaboomModel)
         inbuilt("samurott", ::SamurottModel)
+        inbuilt("snivy", ::SnivyModel)
+        inbuilt("servine", ::ServineModel)
+        inbuilt("serperior", ::SerperiorModel)
         inbuilt("slugma", ::SlugmaModel)
         inbuilt("magcargo", ::MagcargoModel)
         inbuilt("slugma_shiny", ::SlugmaShinyModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/sound/instances/UIEntitySoundInstance.kt

@@ -1,22 +0,0 @@
-/*
- * 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.sound.instances
-
-import net.minecraft.client.resources.sounds.SimpleSoundInstance
-import net.minecraft.client.resources.sounds.SoundInstance
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.sounds.SoundSource
-
-/**
- * Plays a sound for a Pokémon rendered in a GUI, where there is no entity to take the sound source from.
- * Unlike [SimpleSoundInstance.forUI] this uses [SoundSource.NEUTRAL] so the Friendly Creatures slider applies.
- */
-class UIEntitySoundInstance(sound: SoundEvent, volume: Float = 1F, pitch: Float = 1F) :
-    SimpleSoundInstance(sound.location, SoundSource.NEUTRAL, volume, pitch, SoundInstance.createUnseededRandom(),
-        false, 0, SoundInstance.Attenuation.NONE, 0.0, 0.0, 0.0, true)

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

@@ -164,9 +164,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Pokemon, lang = "experience_multiplier", SERVER)
     var experienceMultiplier = 2F
 
-    @CobblemonConfigField(Category.Pokemon, lang = "predation_chance", SERVER)
-    var predationChance = 0.05F
-
     @CobblemonConfigField(Category.Spawning, lang = "pokemon_per_chunk", SERVER)
     var pokemonPerChunk = 1F
 

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

@@ -1294,7 +1294,16 @@ open class PokemonEntity(
     }
 
     private fun showInteractionWheel(player: ServerPlayer, itemStack: ItemStack) {
-        val canRide = isRideableFor(player)
+         val canRide = ifRidingAvailableSupply(false) { behaviour, settings, state ->
+            if (platform != PlatformType.NONE) return@ifRidingAvailableSupply false
+            if (tethering != null) return@ifRidingAvailableSupply false;
+            if (seats.isEmpty()) return@ifRidingAvailableSupply false;
+            if ((owner as? ServerPlayer)?.isInBattle() == true) return@ifRidingAvailableSupply false;
+            if (this.owner != player && this.passengers.isEmpty()) return@ifRidingAvailableSupply false;
+            if(pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) return@ifRidingAvailableSupply false;
+            if(beamMode == 3) return@ifRidingAvailableSupply false;
+            return@ifRidingAvailableSupply behaviour.isActive(settings, state, this);
+        }
         if (pokemon.getOwnerPlayer() == player) {
             val cosmeticItemDefinition = CobblemonCosmeticItems.findValidCosmeticForPokemonAndItem(
                 player.level().registryAccess(),
@@ -1316,18 +1325,6 @@ open class PokemonEntity(
         }
     }
 
-    fun isRideableFor(player: ServerPlayer): Boolean = ifRidingAvailableSupply(false) canRide@{ behaviour, settings, state ->
-        if (!player.canInteractWithEntity(this, player.entityInteractionRange())) return@canRide false
-        if (platform != PlatformType.NONE) return@canRide false
-        if (tethering != null) return@canRide false
-        if (seats.isEmpty()) return@canRide false
-        if ((owner as? ServerPlayer)?.isInBattle() == true) return@canRide false
-        if (this.owner != player && this.passengers.isEmpty()) return@canRide false
-        if (pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) return@canRide false
-        if (beamMode == 3) return@canRide false
-        return@canRide behaviour.isActive(settings, state, this)
-    }
-
     override fun getDimensions(pose: Pose): EntityDimensions {
         val scale = effects.mockEffect?.scale ?: (form.baseScale * pokemon.effectiveScale)
         var result = this.exposedForm.hitbox.scale(scale)
@@ -1609,8 +1606,9 @@ open class PokemonEntity(
                 || stack.`is`(CobblemonItemTags.WHITELISTED_ITEMS_TO_HOLD)
 
     fun tryRidingPokemon(player: ServerPlayer): Boolean {
-        if (!isRideableFor(player)) return false
-
+        if (pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) {
+            return false
+        }
         val event = RidePokemonEvent.Pre(player, this)
         CobblemonEvents.RIDE_EVENT_PRE.post(event)
         if (!event.isCanceled) {

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/storage/pc/MovePCPokemonBatchPacket.kt

@@ -0,0 +1,55 @@
+/*
+ * 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://www.mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.messages.server.storage.pc
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.api.storage.pc.PCPosition
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readPCPosition
+import com.cobblemon.mod.common.util.writePCPosition
+import java.util.UUID
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class MovePCPokemonBatchPacket(val moves: List<PCPokemonMove>) : NetworkPacket<MovePCPokemonBatchPacket> {
+    override val id = ID
+
+    data class PCPokemonMove(
+        val pokemonID: UUID,
+        val oldPosition: PCPosition,
+        val newPosition: PCPosition
+    )
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeVarInt(moves.size)
+        moves.forEach { move ->
+            buffer.writeUUID(move.pokemonID)
+            buffer.writePCPosition(move.oldPosition)
+            buffer.writePCPosition(move.newPosition)
+        }
+    }
+
+    companion object {
+        val ID = cobblemonResource("move_pc_pokemon_batch")
+        const val MAX_MOVES = 60
+
+        fun decode(buffer: RegistryFriendlyByteBuf): MovePCPokemonBatchPacket {
+            val size = buffer.readVarInt()
+            require(size in 1..MAX_MOVES) { "Invalid batch PC move size: $size" }
+            return MovePCPokemonBatchPacket(
+                List(size) {
+                    PCPokemonMove(
+                        pokemonID = buffer.readUUID(),
+                        oldPosition = buffer.readPCPosition(),
+                        newPosition = buffer.readPCPosition()
+                    )
+                }
+            )
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/pc/MovePCPokemonBatchHandler.kt

@@ -0,0 +1,23 @@
+/*
+ * 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://www.mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.serverhandling.storage.pc
+
+import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.level.ServerPlayer
+
+object MovePCPokemonBatchHandler : ServerNetworkPacketHandler<MovePCPokemonBatchPacket> {
+    override fun handle(packet: MovePCPokemonBatchPacket, server: MinecraftServer, player: ServerPlayer) {
+        val pc = PCLinkManager.getPC(player) ?: return run { ClosePCPacket(null).sendToPlayer(player) }
+        pc.moveBatch(packet.moves.map { Triple(it.pokemonID, it.oldPosition, it.newPosition) })
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/PlatformEvents.kt

@@ -55,8 +55,6 @@ object PlatformEvents {
     @JvmField
     val CLIENT_PLAYER_LOGOUT = EventObservable<ClientPlayerEvent.Logout>()
     @JvmField
-    val PLAYER_RESPAWN = EventObservable<ServerPlayerEvent.Respawn>()
-    @JvmField
     val PLAYER_DEATH = CancelableObservable<ServerPlayerEvent.Death>()
     @JvmField
     val RIGHT_CLICK_BLOCK = CancelableObservable<ServerPlayerEvent.RightClickBlock>()

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/ServerPlayerEvent.kt

@@ -50,11 +50,6 @@ interface ServerPlayerEvent {
      */
     data class Logout(override val player: ServerPlayer) : ServerPlayerEvent
 
-    /**
-     * Fired when the [player] respawns (either by coming back from the end or dying).
-     */
-    data class Respawn(override val player: ServerPlayer) : ServerPlayerEvent
-
     /**
      * Fired when the [player] dies.
      * If canceled the death will be prevented but healing is required in order to not be stuck in a loop.

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

@@ -135,18 +135,17 @@ internal object PropertiesCompletionProvider : DataRegistry {
     private fun addDefaults() {
         this.inject(setOf("level", "lvl", "l"), setOf("1", "${Cobblemon.config.maxPokemonLevel}") )
         this.inject(setOf("shiny", "s"), setOf("yes", "no"))
-        this.inject(setOf("alpha", "is_alpha"), setOf("yes", "no"))
         this.inject(setOf("gender"), Gender.entries.map { it.name.lowercase() })
         this.inject(setOf("friendship"), setOf("0", Cobblemon.config.maxPokemonFriendship.toString()))
         this.inject(setOf("fullness"), setOf("0", "255"))
         this.inject(setOf("pokeball"), PokeBalls.all().map { it.name.simplify() })
         this.inject(setOf("nature"), Natures.all().map { it.name.simplify() })
         this.inject(setOf("ability"), Abilities.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
-        this.inject(setOf("dmax_level", "dmax"), setOf("0", Cobblemon.config.maxDynamaxLevel.toString()))
-        this.inject(setOf("gmax_factor", "gmax"), setOf("yes", "no"))
+        this.inject(setOf("dmax"), setOf("0", Cobblemon.config.maxDynamaxLevel.toString()))
+        this.inject(setOf("gmax"), setOf("yes", "no"))
         this.inject(setOf("type", "elemental_type"), ElementalTypes.all().map { it.name })
         this.inject(setOf("tera_type", "tera"), TeraTypes.map { it.id.simplify() })
-        this.inject(setOf("tradeable", "tradable"), setOf("yes", "no"))
+        this.inject(setOf("tradeable"), setOf("yes", "no"))
         this.inject(setOf("originaltrainer", "ot"), setOf(""))
         this.inject(setOf("originaltrainertype", "ottype"), setOf("None", "Player", "NPC"))
         this.inject(setOf("nickname", "nick"), setOf(""))

common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt

@@ -26,6 +26,5 @@ object CobblemonGameRules {
     val SHINY_STARTERS: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doShinyStarters", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
     @JvmField
     val HEALERS_HEAL_PC: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersHealPC", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
-    @JvmField
-    val DO_POKEMON_PREDATION: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doPokemonPredation", GameRules.Category.MOBS, BooleanRuleInvoker.`cobblemon$create`(true))
+
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0026_raichu/raichu_cap.animation.json

@@ -217,7 +217,7 @@
 				}
 			}
 		},
-		"animation.raichu_cap.water_surface_swim": {
+		"animation.raichu_cap.water_swim": {
 			"loop": true,
 			"animation_length": 1,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0265_wurmple/wurmple.animation.json

@@ -364,14 +364,6 @@
 					"rotation": [-22.5, 0, 0]
 				}
 			}
-		},
-		"animation.wurmple.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.wurmple.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0266_silcoon/silcoon.animation.json

@@ -212,14 +212,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.silcoon.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.silcoon.cry"
-				}
-			}
 		}
 	}
 }

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

@@ -361,14 +361,6 @@
 					"rotation": [0, 20, 0]
 				}
 			}
-		},
-		"animation.beautifly.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.beautifly.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0268_cascoon/cascoon.animation.json

@@ -194,14 +194,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.cascoon.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.cascoon.cry"
-				}
-			}
 		}
 	}
 }

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

@@ -255,30 +255,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.dustox.cry": {
-			"animation_length": 1,
-			"bones": {
-				"mouth_closed_smile": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"0.625": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0833": {
-					"effect": "pokemon.dustox.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0283_surskit/surskit.animation.json

@@ -149,14 +149,6 @@
 					"rotation": [0, 0, 22.5]
 				}
 			}
-		},
-		"animation.surskit.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.surskit.cry"
-				}
-			}
 		}
 	},
 	"geckolib_format_version": 2

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0284_masquerain/masquerain.animation.json

@@ -158,11 +158,6 @@
 						"0.75": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.masquerain.cry"
-				}
 			}
 		}
 	},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0396_starly/starly.animation.json

@@ -447,11 +447,6 @@
 						"1.5": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.starly.cry"
-				}
 			}
 		}
 	}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0397_staravia/staravia.animation.json

@@ -331,11 +331,6 @@
 						"1.5": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.staravia.cry"
-				}
 			}
 		},
 		"animation.staravia.blink": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0415_combee/combee.animation.json

@@ -464,11 +464,6 @@
 						"1.5": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.combee.cry"
-				}
 			}
 		}
 	}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0416_vespiquen/vespiquen.animation.json

@@ -824,14 +824,6 @@
 					}
 				}
 			}
-		},
-		"animation.vespiquen.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.vespiquen.cry"
-				}
-			}
 		}
 	}
 }

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

@@ -589,7 +589,7 @@
 		"animation.frogadier.battle_idle": {
 			"loop": true,
 			"bones": {
-				"body": {
+				"frogadier": {
 					"position": [0, -8, 0]
 				},
 				"torso": {

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

@@ -400,30 +400,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.helioptile.cry": {
-			"animation_length": 1.2083,
-			"bones": {
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"1.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0833": {
-					"effect": "pokemon.helioptile.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0695_heliolisk/heliolisk.animation.json

@@ -563,14 +563,6 @@
 					"position": [0.1, 0, 0]
 				}
 			}
-		},
-		"animation.heliolisk.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.heliolisk.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0736_grubbin/grubbin.animation.json

@@ -125,11 +125,6 @@
 						"0.5417": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0417": {
-					"effect": "pokemon.grubbin.cry"
-				}
 			}
 		},
 		"animation.grubbin.physical": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0737_charjabug/charjabug.animation.json

@@ -38,11 +38,6 @@
 						"0.625": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
 					}
 				}
-			},
-			"sound_effects": {
-				"0.0833": {
-					"effect": "pokemon.charjabug.cry"
-				}
 			}
 		},
 		"animation.charjabug.ditto_face": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0867_runerigus/runerigus.animation.json

@@ -326,14 +326,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.runerigus.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.runerigus.cry"
-				}
-			}
 		}
 	}
 }

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

@@ -68,7 +68,7 @@
 					"parent": "torso",
 					"pivot": [0, 13, 2],
 					"locators": {
-						"seat_1": [0, 13, 2]
+						"seat": [0, 13, 2]
 					}
 				},
 				{

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

@@ -7,7 +7,7 @@
   "animations": {
     "cry": "q.bedrock_stateful('pidgeot', 'cry')",
     "recoil": "q.bedrock_stateful('pidgeot', 'recoil')",
-    "status": "q.bedrock_primary('pidgeot', 'status', q.curve('symmetrical_wide'))"
+    "special": "q.bedrock_primary('pidgeot', 'special', q.curve('symmetrical'))"
   },
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

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

@@ -64,7 +64,7 @@
         "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head')",
-        "q.bedrock('spearow', 'ground_idle')"
+        "q.bedrock('spearow', 'air_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -93,7 +93,7 @@
         "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head')",
-        "q.bedrock('spearow', 'ground_idle')"
+        "q.bedrock('spearow', 'air_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [

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

@@ -16,6 +16,9 @@
         "q.look('head_ai', 1, 1, 8, -18, 10, -10)",
         "q.bedrock('oddish', 'battle_idle')"
       ],
+      "namedAnimations": {
+          "cry": "q.bedrock_stateful('oddish', 'battle_cry')"
+        },
       "quirks": ["q.bedrock_quirk('oddish', 'blink')"]
     },
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0044_gloom/gloom.json

@@ -16,6 +16,9 @@
         "q.look('head_ai', 1, 1, 6, -18, 10, -10)",
         "q.bedrock('gloom', 'battle_idle')"
       ],
+      "namedAnimations": {
+          "cry": "q.bedrock_stateful('gloom', 'battle_cry')"
+        },
       "quirks": ["q.bedrock_quirk('gloom', 'blink')"]
     },
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0045_vileplume/vileplume.json

@@ -16,6 +16,9 @@
         "q.look('head_ai', 1, 1, 6, -18, 10, -10)",
         "q.bedrock('vileplume', 'battle_idle')"
       ],
+      "namedAnimations": {
+          "cry": "q.bedrock_stateful('vileplume', 'battle_cry')"
+        },
       "quirks": [
         "q.bedrock_quirk('vileplume', 'blink')",
         "q.bedrock_primary_quirk('vileplume', 'quirk', 20, 40, 1, q.curve('symmetrical_wide'))"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0050_diglett/diglett.json

@@ -7,6 +7,7 @@
   "animations": {
     "faint": "q.bedrock_primary('diglett', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('diglett', 'cry')",
+    "recoil": "q.bedrock_stateful('diglett', 'recoil')",
     "physical": "q.bedrock_primary('diglett', 'physical', q.curve('symmetrical'))"
   },
   "poses": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0050_diglett/diglett_alolan.json

@@ -5,9 +5,9 @@
   "profileTranslation": [0.0, 0.3, 0],
   "rootBone": "diglett_alolan",
   "animations": {
-    "faint": "q.bedrock_primary('diglett_alolan', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('diglett_alolan', 'cry')",
-    "physical": "q.bedrock_primary('diglett_alolan', 'physical', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('diglett_alolan', 'recoil')",
+    "physical": "q.bedrock_primary('diglett_alolan', 'physical', q.curve('symmetrical'))"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0051_dugtrio/dugtrio.json

@@ -7,6 +7,7 @@
   "animations": {
     "faint": "q.bedrock_primary('dugtrio', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('dugtrio', 'cry')",
+    "recoil": "q.bedrock_stateful('dugtrio', 'recoil')",
     "physical": "q.bedrock_primary('dugtrio', 'physical', q.curve('symmetrical'))"
   },
   "poses": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0051_dugtrio/dugtrio_alolan.json

@@ -5,9 +5,9 @@
   "profileTranslation": [0.0, 0.29, 0],
   "rootBone": "dugtrio_alolan",
   "animations": {
-    "faint": "q.bedrock_primary('dugtrio_alolan', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('dugtrio_alolan', 'cry')",
-    "physical": "q.bedrock_primary('dugtrio_alolan', 'physical', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('dugtrio_alolan', 'recoil')",
+    "physical": "q.bedrock_primary('dugtrio_alolan', 'physical', q.curve('symmetrical'))"
   },
   "poses": {
     "standing": {

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

@@ -83,7 +83,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacool', 'sleep')"]
+      "animations": ["q.bedrock('tentacool', 'ground_sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0073_tentacruel/tentacruel.json

@@ -108,7 +108,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacruel', 'water_sleep')"]
+      "animations": ["q.bedrock('tentacruel', 'sleep')"]
     },
     "ground-sleep": {
       "poseTypes": ["SLEEP"],
@@ -116,7 +116,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacruel', 'ground_sleep')"]
+      "animations": ["q.bedrock('tentacruel', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json

@@ -6,7 +6,8 @@
   "rootBone": "golem",
   "animations": {
     "cry": "q.bedrock_stateful('golem', 'cry')",
-    "recoil": "q.bedrock_stateful('golem', 'recoil')"
+    "recoil": "q.bedrock_stateful('golem', 'recoil')",
+    "status": "q.bedrock_stateful('golem', 'status', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json

@@ -6,7 +6,8 @@
   "rootBone": "golem",
   "animations": {
     "cry": "q.bedrock_stateful('golem_alolan', 'cry')",
-    "recoil": "q.bedrock_stateful('golem_alolan', 'recoil')"
+    "recoil": "q.bedrock_stateful('golem_alolan', 'recoil')",
+    "status": "q.bedrock_stateful('golem_alolan', 'status', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0088_grimer/grimer.json

@@ -6,7 +6,8 @@
   "rootBone": "grimer",
   "animations": {
     "cry": "q.bedrock_stateful('grimer', 'cry')",
-    "recoil": "q.bedrock_stateful('grimer', 'recoil')"
+    "recoil": "q.bedrock_stateful('grimer', 'recoil')",
+    "status": "q.bedrock_stateful('grimer', 'status', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0088_grimer/grimer_alolan.json

@@ -6,7 +6,8 @@
   "rootBone": "grimer_alola",
   "animations": {
     "cry": "q.bedrock_stateful('grimer', 'cry')",
-    "recoil": "q.bedrock_stateful('grimer', 'recoil')"
+    "recoil": "q.bedrock_stateful('grimer', 'recoil')",
+    "status": "q.bedrock_stateful('grimer', 'status', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0105_marowak/marowak_alolan.json

@@ -1,6 +1,6 @@
 {
   "portraitScale": 1.82,
-  "portraitTranslation": [0.15, 0.52, 0],
+  "portraitTranslation": [-0.01, 0.64, 0],
   "profileScale": 0.84,
   "profileTranslation": [0, 0.51, 0],
   "rootBone": "marowak_alolan",
@@ -36,7 +36,7 @@
     },
     "portrait": {
       "poseTypes": ["PORTRAIT"],
-      "animations": ["q.bedrock('marowak_alolan', 'ground_idle')"]
+      "animations": ["q.bedrock('marowak_alolan', 'portrait')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0110_weezing/weezing.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, 0.46, 0],
   "rootBone": "weezing",
   "animations": {
+    "faint": "q.bedrock_primary('weezing', 'faint')",
     "cry": "q.bedrock_stateful('weezing', 'cry')",
     "recoil": "q.bedrock_stateful('weezing', 'recoil')",
     "physical": "q.bedrock_primary('weezing', 'physical', q.curve('symmetrical_wide'))",
@@ -56,7 +57,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('weezing', 'battle_sleep')"]
+      "animations": ["q.bedrock('weezing', 'battle-sleep')"]
     },
     "sleep": {
       "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0110_weezing/weezing_galar.json

@@ -39,6 +39,10 @@
         "q.bedrock_quirk('weezing_galar', 'blink')",
         "q.bedrock_quirk('weezing_galar', 'blink2')"
       ]
+    },
+    "sleeping": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('weezing_galar', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0112_rhydon/rhydon.json

@@ -33,7 +33,10 @@
       "quirks": [
         "q.bedrock_quirk('rhydon', 'blink')",
         "q.bedrock_quirk('rhydon', 'battle_quirk')"
-      ]
+      ],
+      "namedAnimations": {
+        "cry": "q.bedrock_primary('rhydon', 'battle_cry', q.curve('symmetrical_wide'))"
+      }
     },
     "jump": {
       "poseTypes": ["STAND", "WALK"],

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

@@ -94,6 +94,13 @@
         "q.bedrock('mr_mime', 'ground_run')"
       ],
       "quirks": ["q.bedrock_quirk('mr_mime', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      },
+      "animations": ["q.bedrock('mr_mime', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros.json

@@ -75,6 +75,13 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      },
+      "animations": ["q.bedrock('tauros', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros_paldean_aqua.json

@@ -120,6 +120,13 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros_paldean_aqua', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      },
+      "animations": ["q.bedrock('tauros_paldean_aqua', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros_paldean_blaze.json

@@ -74,6 +74,13 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros_paldean_blaze', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      },
+      "animations": ["q.bedrock('tauros_paldean_blaze', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0138_omanyte/omanyte.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, -0.02, 0],
   "rootBone": "omanyte",
   "animations": {
+    "faint": "q.bedrock_primary('omanyte', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('omanyte', 'cry')"
   },
   "poses": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0139_omastar/omastar.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, 0.066, 0],
   "rootBone": "omastar",
   "animations": {
+    "faint": "q.bedrock_primary('omastar', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('omastar', 'cry')"
   },
   "poses": {

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

@@ -169,7 +169,7 @@
         "q.look('neck', 1, 1, 25, -20, 20, -20)",
         "q.look('head', 1, 1, 22.5, -10, 15, -15)",
         "q.bedrock('aerodactyl', 'air_glide')",
-        "q.bedrock('aerodactyl', 'ride_dive')",
+        "q.bedrock('aerodactyl', 'air_dive')",
         {
           "condition": "q.is_ridden",
           "animation": "q.bedrock('aerodactyl', 'ride_air_glide')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0160_feraligatr/feraligatr.json

@@ -5,7 +5,8 @@
   "profileTranslation": [0, 0.84, -10],
   "rootBone": "feraligatr",
   "animations": {
-    "cry": "q.bedrock_stateful('feraligatr', 'cry')"
+    "cry": "q.bedrock_stateful('feraligatr', 'cry')",
+    "recoil": "q.bedrock_stateful('feraligatr', 'recoil')"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0182_bellossom/bellossom.json

@@ -16,6 +16,9 @@
         "q.look('head_ai')",
         "q.bedrock('bellossom', 'battle_idle')"
       ],
+      "namedAnimations": {
+          "cry": "q.bedrock_stateful('bellossom', 'battle_cry')"
+        },
       "quirks": [
         "q.bedrock_quirk('bellossom', 'blink')"
       ]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0265_wurmple/wurmple.json

@@ -4,9 +4,6 @@
   "profileScale": 0.98,
   "profileTranslation": [0.00, 0.24, 0],
   "rootBone": "wurmple",
-  "animations": {
-    "cry": "q.bedrock_stateful('wurmple', 'cry')"
-  },
   "poses": {
 	"battle-standing": {
      "poseTypes": ["STAND"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0266_silcoon/silcoon.json

@@ -4,9 +4,6 @@
   "profileScale": 0.80,
   "profileTranslation": [0.00, 0.48, 0],
   "rootBone": "silcoon",
-  "animations": {
-    "cry": "q.bedrock_stateful('silcoon', 'cry')"
-  },
   "poses": {
 	"battle-standing": {
      "poseTypes": ["STAND"],

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

@@ -4,9 +4,6 @@
   "profileScale": 0.60,
   "profileTranslation": [0, 0.90, 0],
   "rootBone": "beautifly",
-  "animations": {
-    "cry": "q.bedrock_stateful('beautifly', 'cry')"
-  },
   "poses": {
 	"battle-standing": {
      "poseTypes": ["STAND"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0268_cascoon/cascoon.json

@@ -4,9 +4,6 @@
   "profileScale": 0.74,
   "profileTranslation": [0.00, 0.57, 0],
   "rootBone": "cascoon",
-  "animations": {
-    "cry": "q.bedrock_stateful('cascoon', 'cry')"
-  },
   "poses": {
 	"battle-standing": {
      "poseTypes": ["STAND"],

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

@@ -4,9 +4,6 @@
   "profileScale": 0.63,
   "profileTranslation": [0, 0.64, 0],
   "rootBone": "dustox",
-  "animations": {
-    "cry": "q.bedrock_stateful('dustox', 'cry')"
-  },
   "poses": {
 	"battle-standing": {
      "poseTypes": ["STAND"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0370_luvdisc/luvdisc.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, -1.3, 0],
   "rootBone": "luvdisc",
   "animations": {
+    "cry": "q.bedrock_stateful('luvdisc', 'cry')",
     "faint": "q.bedrock_primary('luvdisc', 'ground_faint', q.curve('one'))"
   },
   "poses": {
@@ -43,12 +44,12 @@
     "ground-sleep": {
       "poseTypes": ["SLEEP"],
       "isTouchingWater": false,
-      "animations": ["q.bedrock('luvdisc', 'ground_sleep')"]
+      "animations": ["q.bedrock('luvdisc', 'ground-sleep')"]
     },
     "water-sleep": {
       "poseTypes": ["SLEEP"],
       "isTouchingWater": true,
-      "animations": ["q.bedrock('luvdisc', 'water_sleep')"]
+      "animations": ["q.bedrock('luvdisc', 'water-sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0496_servine/servine.json

@@ -17,6 +17,10 @@
       "poseTypes": ["WALK"],
       "animations": ["q.look('head_ai')", "q.bedrock('servine', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('servine', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('servine', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0499_pignite/pignite.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, 0.82, 0],
   "rootBone": "pignite",
   "animations": {
+    "faint": "q.bedrock_primary('pignite', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('pignite', 'cry')",
     "recoil": "q.bedrock_stateful('pignite', 'recoil')"
   },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0500_emboar/emboar.json

@@ -5,6 +5,7 @@
   "profileTranslation": [0, 0.96, 0],
   "rootBone": "emboar",
   "animations": {
+    "faint": "q.bedrock_primary('emboar', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('emboar', 'cry')",
     "recoil": "q.bedrock_stateful('pignite', 'recoil')"
   },

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

@@ -39,7 +39,10 @@
       ],
       "quirks": [
         "q.bedrock_quirk('archeops', 'blink')"
-      ]
+      ],
+      "namedAnimations": {
+        "cry": "q.bedrock_primary('archeops', 'battle_cry', q.curve('symmetrical_wide'))"
+      }
     },
     "battle-flying": {
       "poseTypes": ["HOVER"],
@@ -211,6 +214,7 @@
         "q.bedrock('archeops', 'sleep')"
       ],
       "quirks": [
+        "q.bedrock_quirk('archeops', 'sleep_quirk')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0653_fennekin/fennekin.json

@@ -11,13 +11,13 @@
     "standing": {
       "poseName": "standing",
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE", "FLOAT"],
-      "animations": ["q.look('head_ai')", "q.bedrock('fennekin', 'ground_idle')"],
+      "animations": ["q.look('head')", "q.bedrock('fennekin', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('fennekin', 'blink')"]
     },
     "walking": {
       "poseName": "walking",
       "poseTypes": ["WALK", "SWIM"],
-      "animations": ["q.look('head_ai')", "q.bedrock('fennekin', 'ground_walk')"],
+      "animations": ["q.look('head')", "q.bedrock('fennekin', 'ground_walk')"],
       "quirks": ["q.bedrock_quirk('fennekin', 'blink')"]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0654_braixen/braixen.json

@@ -12,21 +12,21 @@
       "poseName": "battle-standing",
       "poseTypes": ["STAND"],
       "isBattle": true,
-      "animations": ["q.look('head_ai')", "q.bedrock('braixen', 'battle_idle')"],
+      "animations": ["q.look('head')", "q.bedrock('braixen', 'battle_idle')"],
       "quirks": ["q.bedrock_quirk('braixen', 'blink')"]
     },
     "standing": {
       "poseName": "standing",
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE", "FLOAT"],
       "isBattle": false,
-      "animations": ["q.look('head_ai')", "q.bedrock('braixen', 'ground_idle')"],
+      "animations": ["q.look('head')", "q.bedrock('braixen', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('braixen', 'blink')"]
     },
     "walking": {
       "poseName": "walking",
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
-        "q.look('head_ai')",
+        "q.look('head')",
         "q.bedrock('braixen', 'ground_walk')"
       ],
       "quirks": ["q.bedrock_quirk('braixen', 'blink')"],

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

@@ -4,9 +4,7 @@
   "profileScale": 0.5,
   "profileTranslation": [-0.05,1,0],
   "rootBone": "helioptile",
-  "animations": {
-    "cry": "q.bedrock_stateful('helioptile', 'cry')"
-  },
+  "animations": { },
   "poses": {
     "standing": {
       "poseTypes": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0695_heliolisk/heliolisk.json

@@ -4,9 +4,7 @@
   "profileScale": 0.5,
   "profileTranslation": [0,1,0],
   "rootBone": "heliolisk",
-  "animations": {
-    "cry": "q.bedrock_stateful('heliolisk', 'cry')"
-  },
+  "animations": {},
   "poses": {
     "standing": {
       "poseTypes": [