Added class GameData::BodyShape, some bug fixes, updated some PBS files

PBS/pokemonforms.txt

@@ -265,7 +265,7 @@ Abilities = SHELLARMOR
 HiddenAbility = SHELLARMOR
 Height = 2.0
 Weight = 120.0
-Shape = 4
+Shape = HeadArms
 Pokedex = Having been swallowed whole by Shellder, Slowbro now has an iron defense. It's pretty comfortable in there, too.
 #-------------------------------
 [GRIMER,1]
@@ -350,7 +350,7 @@ Abilities = AERILATE
 HiddenAbility = AERILATE
 Height = 1.7
 Weight = 59.0
-Shape = 13
+Shape = MultiWinged
 Pokedex = It zips around at blistering speeds, looking for an opening to skewer its opponent on its giant pincers.
 #-------------------------------
 [GYARADOS,1]
@@ -944,7 +944,7 @@ HiddenAbility = LEVITATE
 TutorMoves = AERIALACE,AQUATAIL,BRUTALSWING,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,CUT,DARKPULSE,DEFOG,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DRAGONTAIL,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FLY,FRUSTRATION,GIGAIMPACT,GRAVITY,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICYWIND,IRONHEAD,IRONTAIL,MAGICCOAT,OUTRAGE,PAYBACK,PROTECT,PSYCHIC,PSYCHUP,RAINDANCE,REST,RETURN,ROAR,ROCKSMASH,ROUND,SAFEGUARD,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SLEEPTALK,SNORE,SPITE,STEELWING,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,WILLOWISP
 Height = 6.9
 Weight = 650.0
-Shape = 2
+Shape = Serpentine
 BattlerEnemyX = -2
 BattlerEnemyY = -8
 #-------------------------------
@@ -1093,7 +1093,7 @@ EffortPoints = 0,0,0,3,0,0
 Abilities = REGENERATOR
 HiddenAbility = REGENERATOR
 Height = 1.4
-Shape = 9
+Shape = Winged
 BattlerPlayerX = -2
 BattlerEnemyX = 8
 BattlerEnemyY = 11
@@ -1106,7 +1106,7 @@ Abilities = VOLTABSORB
 HiddenAbility = VOLTABSORB
 TutorMoves = ATTRACT,BRICKBREAK,BRUTALSWING,BULKUP,CHARGEBEAM,CONFIDE,DARKPULSE,DEFOG,DOUBLETEAM,ELECTROWEB,EMBARGO,FACADE,FLASHCANNON,FLING,FLY,FOCUSBLAST,FOULPLAY,FRUSTRATION,GIGAIMPACT,GRASSKNOT,HIDDENPOWER,HYPERBEAM,IRONTAIL,KNOCKOFF,PAYBACK,PROTECT,PSYCHIC,RAINDANCE,REST,RETURN,ROCKSMASH,ROLEPLAY,ROUND,SHOCKWAVE,SKYDROP,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SMACKDOWN,SNORE,STRENGTH,SUBSTITUTE,SUPERPOWER,SWAGGER,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERPUNCH,THUNDERWAVE,TORMENT,TOXIC,UPROAR,UTURN,VOLTSWITCH,WILDCHARGE
 Height = 3.0
-Shape = 6
+Shape = BipedalTail
 BattlerPlayerX = -3
 BattlerEnemyX = 2
 BattlerEnemyY = 5
@@ -1118,7 +1118,7 @@ EffortPoints = 0,3,0,0,0,0
 Abilities = INTIMIDATE
 HiddenAbility = INTIMIDATE
 Height = 1.3
-Shape = 8
+Shape = Quadruped
 BattlerPlayerX = -8
 BattlerEnemyX = 3
 BattlerEnemyY = 14
@@ -1402,7 +1402,7 @@ BaseStats = 54,100,71,115,61,85
 Height = 1.2
 Weight = 33.5
 Color = Black
-Shape = 8
+Shape = Quadruped
 Pokedex = This is Zygarde when about 10% of its pieces have been assembled. It leaps at its opponent's chest and sinks its sharp fangs into them.
 #-------------------------------
 [ZYGARDE,2]
@@ -1412,7 +1412,7 @@ Abilities = POWERCONSTRUCT
 Height = 4.5
 Weight = 610.0
 Color = Black
-Shape = 6
+Shape = BipedalTail
 Pokedex = This is Zygarde's perfected form. From the orifice on its chest, it radiates high-powered energy that eliminates everything.
 #-------------------------------
 [ZYGARDE,3]
@@ -1422,7 +1422,7 @@ Abilities = POWERCONSTRUCT
 Height = 4.5
 Weight = 610.0
 Color = Black
-Shape = 6
+Shape = BipedalTail
 #-------------------------------
 [DIANCIE,1]
 FormName = Mega Diancie
@@ -1441,7 +1441,7 @@ BaseStats = 80,160,60,80,170,130
 Moves = 1,HYPERSPACEFURY,1,TRICK,1,DESTINYBOND,1,ALLYSWITCH,1,CONFUSION,6,ASTONISH,10,MAGICCOAT,15,LIGHTSCREEN,19,PSYBEAM,25,SKILLSWAP,29,POWERSPLIT,29,GUARDSPLIT,46,KNOCKOFF,50,WONDERROOM,50,TRICKROOM,55,DARKPULSE,75,PSYCHIC,85,HYPERSPACEFURY
 Height = 6.5
 Weight = 490.0
-Shape = 6
+Shape = BipedalTail
 #-------------------------------
 [ORICORIO,1]
 FormName = Pom-Pom Style
@@ -1478,7 +1478,7 @@ Moves = 0,COUNTER,1,COUNTER,1,REVERSAL,1,TAUNT,1,TACKLE,1,LEER,1,SANDATTACK,1,BI
 TutorMoves = ATTRACT,BRICKBREAK,BULKUP,CONFIDE,COVET,DOUBLETEAM,DUALCHOP,EARTHPOWER,ECHOEDVOICE,ENDEAVOR,FACADE,FIREPUNCH,FOCUSPUNCH,FOULPLAY,FRUSTRATION,HIDDENPOWER,HYPERVOICE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASERFOCUS,LASTRESORT,OUTRAGE,PROTECT,REST,RETURN,ROAR,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SLEEPTALK,SNARL,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,SWORDSDANCE,TAUNT,THROATCHOP,THUNDERPUNCH,TOXIC,UPROAR,ZENHEADBUTT
 Height = 1.1
 Color = Red
-Shape = 6
+Shape = BipedalTail
 Pokedex = It goads its enemies into attacking, withstands the hits, and in return, delivers a headbutt, crushing their bones with its rocky mane.
 #-------------------------------
 [LYCANROC,2]
@@ -1495,7 +1495,7 @@ FormName = School Form
 BaseStats = 45,140,130,30,140,135
 Height = 8.2
 Weight = 78.6
-Shape = 11
+Shape = MultiBody
 Pokedex = Weak Wishiwashi school together to concentrate their power. Their united force makes them the demon of the sea, feared near and far.
 #-------------------------------
 [SILVALLY,1]
@@ -1640,7 +1640,7 @@ EffortPoints = 0,3,0,0,0,0
 Height = 3.8
 Weight = 460.0
 Color = Yellow
-Shape = 8
+Shape = Quadruped
 Pokedex = This is Necrozma's form while it's absorbing the power of Solgaleo, making it extremely ferocious and impossible to control.
 #-------------------------------
 [NECROZMA,2]