Wooper Heart Fix. <3

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0194_wooper/wooper_heart_female.geo.json

@@ -11,15 +11,6 @@
 				"visible_bounds_offset": [0, 0.75, 0]
 			},
 			"bones": [
-				{
-					"name": "bb_main",
-					"pivot": [0, 0, 0],
-					"cubes": [
-						{"origin": [0.2, 5.5, -2.01], "size": [1, 1, 0], "inflate": 0.01, "uv": [0, 9]},
-						{"origin": [-1.2, 5.5, -2.01], "size": [1, 1, 0], "inflate": 0.01, "uv": [2, 9]},
-						{"origin": [-0.5, 5.1, -2.01], "size": [1, 1, 0], "uv": [4, 9]}
-					]
-				},
 				{
 					"name": "wooper",
 					"pivot": [0, 0, 0]
@@ -50,6 +41,9 @@
 					"parent": "body",
 					"pivot": [0, 4, 0],
 					"cubes": [
+						{"origin": [0.2, 5.5, -2.01], "size": [1, 1, 0], "inflate": 0.01, "uv": [0, 9]},
+						{"origin": [-0.5, 5.1, -2.01], "size": [1, 1, 0], "uv": [4, 9]},
+						{"origin": [-1.2, 5.5, -2.01], "size": [1, 1, 0], "inflate": 0.01, "uv": [2, 9]},
 						{"origin": [-2.5, 5, -2], "size": [5, 2, 4], "uv": [24, 31]},
 						{"origin": [-3, 1, -2.5], "size": [6, 4, 5], "uv": [17, 22]},
 						{"origin": [-2.5, 1.25, -2.525], "size": [5, 2, 0], "uv": [0, 4]},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0194_wooper/0_wooper_base.json

@@ -11,7 +11,7 @@
     },
     {
       "aspects": [
-        "wooper-heart-heart", "male"
+        "wooper_heart"
       ],
       "model": "cobblemon:wooper_heart_male.geo"
     },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0194_wooper/1_wooper_female.json

@@ -2,17 +2,17 @@
   "species": "cobblemon:wooper",
   "order": 1,
   "variations": [
-    {
-      "aspects": [
-        "wooper-heart-heart", "female"
-      ],
-      "model": "cobblemon:wooper_heart_female.geo"
-    },
     {
       "aspects": [
         "female"
       ],
       "model": "cobblemon:wooper_female.geo"
+    },
+    {
+      "aspects": [
+        "wooper_heart", "female"
+      ],
+      "model": "cobblemon:wooper_heart_female.geo"
     }
   ]
 }

common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json

@@ -148,7 +148,7 @@
         },
         {
             "id": "wooper-fishing-2",
-            "pokemon": "wooper wooper_heart=heart",
+            "pokemon": "wooper wooper_heart",
             "type": "pokemon",
             "context": "fishing",
             "bucket": "common",

common/src/main/resources/data/cobblemon/species_features/wooper_heart.json

@@ -1,11 +1,6 @@
 {
-  "type": "choice",
   "keys": ["wooper_heart"],
-  "default": "standard",
-  "choices": [
-    "standard",
-    "heart"
-  ],
+  "type": "flag",
   "isAspect": true,
-  "aspectFormat": "wooper-heart-{{choice}}"
+  "default": false
 }