Merge branch 'dev' into ai

PBS/abilities.txt

@@ -158,8 +158,8 @@ Description = The Pokémon is protected from flinching.
 #-------------------------------
 [MAGMAARMOR]
 Name = Magma Armor
-Flags = FasterEggHatching
 Description = Prevents the Pokémon from becoming frozen.
+Flags = FasterEggHatching
 #-------------------------------
 [WATERVEIL]
 Name = Water Veil
@@ -195,8 +195,8 @@ Description = The Pokémon awakens quickly from sleep.
 #-------------------------------
 [FLAMEBODY]
 Name = Flame Body
-Flags = FasterEggHatching
 Description = Contact with the Pokémon may burn the attacker.
+Flags = FasterEggHatching
 #-------------------------------
 [RUNAWAY]
 Name = Run Away
@@ -972,8 +972,8 @@ Description = This Pokémon's moves cannot be redirected.
 #-------------------------------
 [STEAMENGINE]
 Name = Steam Engine
-Flags = FasterEggHatching
 Description = Boosts Speed drastically if hit by a Fire or Water move.
+Flags = FasterEggHatching
 #-------------------------------
 [PUNKROCK]
 Name = Punk Rock
@@ -1069,4 +1069,4 @@ Description = Combines Unnerve and Chilling Neigh Abilities.
 #-------------------------------
 [ASONEGRIMNEIGH]
 Name = As One
-Description = Combines Unnerve and Grim Neigh Abilities.
+Description = Combines Unnerve and Grim Neigh Abilities.

PBS/metadata.txt

@@ -18,7 +18,9 @@ WalkCharset = trainer_POKEMONTRAINER_Red
 RunCharset = boy_run
 CycleCharset = boy_bike
 SurfCharset = boy_surf
+DiveCharset = boy_surf
 FishCharset = boy_fish_offset
+SurfFishCharset = boy_fish_offset
 #-------------------------------
 [2]
 TrainerType = POKEMONTRAINER_Leaf
@@ -26,4 +28,6 @@ WalkCharset = trainer_POKEMONTRAINER_Leaf
 RunCharset = girl_run
 CycleCharset = girl_bike
 SurfCharset = girl_surf
+DiveCharset = girl_surf
 FishCharset = girl_fish_offset
+SurfFishCharset = girl_fish_offset

PBS/phone.txt

@@ -28,7 +28,7 @@ Body1 = My \TP is looking more and more like me. It's getting cuter!
 Body2 = And you know? Now we can KO \TE easily.\mI should challenge the Cedolan Gym.
 Body2 = And you know? We just failed to beat \TE by a tiny margin.\mI'm guessing my Pokémon's levels aren't high enough yet...
 BattleRequest = You must be a lot better now, huh?\mHow about showing me your technique in a real battle with me?\mI'll be waiting on \TM.
-BattleReminder = Where are you? Let's have our battle soon!\mI'll be waiting on \TM.
+BattleRemind = Where are you? Let's have our battle soon!\mI'll be waiting on \TM.
 End = See you later!
 #-------------------------------
 [PICNICKER,Susie]
@@ -44,5 +44,5 @@ Body1 = My \TP and I are getting more in sync with each other.
 Body2 = We battled a wild \TE and managed to beat it in a close match.\mWe're getting into the groove!
 Body2 = But, you know what? I still haven't caught \TE.\mIt's getting beyond frustrating...
 BattleRequest = Would you be my practice partner again sometime?\mI'll be waiting on \TM...\mCould you take it a little easier on me next time?
-BattleReminder = How soon can I expect to see you?\mDon't forget, \TM!
+BattleRemind = How soon can I expect to see you?\mDon't forget, \TM!
 End = Bye! Let's chat again!

PBS/pokemon.txt

@@ -5279,6 +5279,7 @@ Evolutions = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
+FormName = A
 Types = PSYCHIC
 BaseStats = 48,72,48,48,72,48
 GenderRatio = Genderless
@@ -5299,7 +5300,6 @@ Shape = Head
 Habitat = Rare
 Category = Symbol
 Pokedex = This Pokémon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown.
-FormName = A
 Generation = 2
 #-------------------------------
 [WOBBUFFET]
@@ -9238,6 +9238,7 @@ Generation = 3
 #-------------------------------
 [CASTFORM]
 Name = Castform
+FormName = Normal Form
 Types = NORMAL
 BaseStats = 70,70,70,70,70,70
 GenderRatio = Female50Percent
@@ -9259,7 +9260,6 @@ Shape = Head
 Habitat = Grassland
 Category = Weather
 Pokedex = It alters its form depending on the weather. Changes in the climate such as the temperature and humidity appear to affect its cellular structure.
-FormName = Normal Form
 Generation = 3
 WildItemCommon = MYSTICWATER
 WildItemUncommon = MYSTICWATER
@@ -10156,6 +10156,7 @@ WildItemRare = STARPIECE
 #-------------------------------
 [DEOXYS]
 Name = Deoxys
+FormName = Normal Forme
 Types = PSYCHIC
 BaseStats = 50,150,50,150,150,50
 GenderRatio = Genderless
@@ -10176,7 +10177,6 @@ Shape = Bipedal
 Habitat = Rare
 Category = DNA
 Pokedex = A Pokémon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed.
-FormName = Normal Forme
 Generation = 3
 #-------------------------------
 [TURTWIG]
@@ -10810,6 +10810,7 @@ Generation = 4
 #-------------------------------
 [BURMY]
 Name = Burmy
+FormName = Plant Cloak
 Types = BUG
 BaseStats = 40,29,45,36,29,45
 GenderRatio = Female50Percent
@@ -10830,13 +10831,13 @@ Color = Green
 Shape = HeadBase
 Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
-FormName = Plant Cloak
 Generation = 4
 Flags = InheritFormFromMother
 Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
+FormName = Plant Cloak
 Types = BUG,GRASS
 BaseStats = 60,59,85,36,79,105
 GenderRatio = AlwaysFemale
@@ -10857,7 +10858,6 @@ Color = Green
 Shape = HeadBase
 Category = Bagworm
 Pokedex = When Burmy evolved, its cloak became a part of this Pokémon's body. The cloak is never shed.
-FormName = Plant Cloak
 Generation = 4
 Flags = InheritFormFromMother
 WildItemUncommon = SILVERPOWDER
@@ -11042,6 +11042,7 @@ Evolutions = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
+FormName = Overcast Form
 Types = GRASS
 BaseStats = 70,60,70,85,87,78
 GenderRatio = Female50Percent
@@ -11061,12 +11062,12 @@ Color = Purple
 Shape = HeadLegs
 Category = Blossom
 Pokedex = Its folded petals are pretty tough. Bird Pokémon can peck at them all they want, and Cherrim won't be bothered at all.
-FormName = Overcast Form
 Generation = 4
 WildItemUncommon = MIRACLESEED
 #-------------------------------
 [SHELLOS]
 Name = Shellos
+FormName = West Sea
 Types = WATER
 BaseStats = 76,48,48,34,57,62
 GenderRatio = Female50Percent
@@ -11088,13 +11089,13 @@ Color = Purple
 Shape = Serpentine
 Category = Sea Slug
 Pokedex = This Pokémon's habitat shapes its physique. According to some theories, life in warm ocean waters causes this variation to develop.
-FormName = West Sea
 Generation = 4
 Flags = InheritFormFromMother
 Evolutions = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
+FormName = West Sea
 Types = WATER,GROUND
 BaseStats = 111,83,68,39,92,82
 GenderRatio = Female50Percent
@@ -11115,7 +11116,6 @@ Color = Purple
 Shape = Serpentine
 Category = Sea Slug
 Pokedex = Its search for food sometimes leads it onto land, where it leaves behind a sticky trail of slime as it passes through.
-FormName = West Sea
 Generation = 4
 Flags = InheritFormFromMother
 #-------------------------------
@@ -12505,6 +12505,7 @@ Generation = 4
 #-------------------------------
 [ROTOM]
 Name = Rotom
+FormName = Rotom
 Types = ELECTRIC,GHOST
 BaseStats = 50,50,77,91,95,77
 GenderRatio = Genderless
@@ -12524,7 +12525,6 @@ Color = Red
 Shape = Head
 Category = Plasma
 Pokedex = Its body is composed of plasma. It is known to infiltrate electronic devices and wreak havoc.
-FormName = Rotom
 Generation = 4
 #-------------------------------
 [UXIE]
@@ -12693,6 +12693,7 @@ Generation = 4
 #-------------------------------
 [GIRATINA]
 Name = Giratina
+FormName = Altered Forme
 Types = GHOST,DRAGON
 BaseStats = 150,100,120,90,100,120
 GenderRatio = Genderless
@@ -12713,7 +12714,6 @@ Color = Black
 Shape = Multiped
 Category = Renegade
 Pokedex = A Pokémon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery.
-FormName = Altered Forme
 Generation = 4
 #-------------------------------
 [CRESSELIA]
@@ -12811,6 +12811,7 @@ Generation = 4
 #-------------------------------
 [SHAYMIN]
 Name = Shaymin
+FormName = Land Forme
 Types = GRASS
 BaseStats = 100,100,100,100,100,100
 GenderRatio = Genderless
@@ -12830,7 +12831,6 @@ Color = Green
 Shape = Quadruped
 Category = Gratitude
 Pokedex = It lives in flower patches and avoids detection by curling up to look like a flowering plant.
-FormName = Land Forme
 Generation = 4
 WildItemCommon = LUMBERRY
 WildItemUncommon = LUMBERRY
@@ -12838,6 +12838,7 @@ WildItemRare = LUMBERRY
 #-------------------------------
 [ARCEUS]
 Name = Arceus
+FormName = Normal Type
 Types = NORMAL
 BaseStats = 120,120,120,120,120,120
 GenderRatio = Genderless
@@ -12857,7 +12858,6 @@ Color = White
 Shape = Quadruped
 Category = Alpha
 Pokedex = It is described in mythology as the Pokémon that shaped the universe with its 1,000 arms.
-FormName = Normal Type
 Generation = 4
 #-------------------------------
 [VICTINI]
@@ -14278,6 +14278,7 @@ WildItemUncommon = ABSORBBULB
 #-------------------------------
 [BASCULIN]
 Name = Basculin
+FormName = Red-Striped
 Types = WATER
 BaseStats = 70,92,65,98,80,55
 GenderRatio = Female50Percent
@@ -14299,7 +14300,6 @@ Color = Green
 Shape = Finned
 Category = Hostile
 Pokedex = Savage, violent Pokémon, red and blue Basculin are always fighting each other over territory.
-FormName = Red-Striped
 Generation = 5
 Flags = InheritFormFromMother
 WildItemUncommon = DEEPSEATOOTH
@@ -14410,6 +14410,7 @@ Evolutions = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
+FormName = Standard Mode
 Types = FIRE
 BaseStats = 105,140,55,95,30,55
 GenderRatio = Female50Percent
@@ -14430,7 +14431,6 @@ Color = Red
 Shape = Quadruped
 Category = Blazing
 Pokedex = When weakened in battle, it transforms into a stone statue. Then it sharpens its mind and fights on mentally.
-FormName = Standard Mode
 Generation = 5
 #-------------------------------
 [MARACTUS]
@@ -15167,6 +15167,7 @@ WildItemCommon = NEVERMELTICE
 #-------------------------------
 [DEERLING]
 Name = Deerling
+FormName = Spring Form
 Types = NORMAL,GRASS
 BaseStats = 60,60,50,75,40,50
 GenderRatio = Female50Percent
@@ -15188,12 +15189,12 @@ Color = Pink
 Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
-FormName = Spring Form
 Generation = 5
 Evolutions = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
+FormName = Spring Form
 Types = NORMAL,GRASS
 BaseStats = 80,100,70,95,60,70
 GenderRatio = Female50Percent
@@ -15214,7 +15215,6 @@ Color = Brown
 Shape = Quadruped
 Category = Season
 Pokedex = The plants growing on its horns change according to the season. The leaders of the herd possess magnificent horns.
-FormName = Spring Form
 Generation = 5
 #-------------------------------
 [EMOLGA]
@@ -16564,6 +16564,7 @@ Generation = 5
 #-------------------------------
 [TORNADUS]
 Name = Tornadus
+FormName = Incarnate Forme
 Types = FLYING
 BaseStats = 79,115,70,111,125,80
 GenderRatio = AlwaysMale
@@ -16584,11 +16585,11 @@ Color = Green
 Shape = HeadArms
 Category = Cyclone
 Pokedex = Tornadus expels massive energy from its tail, causing severe storms. Its power is great enough to blow houses away.
-FormName = Incarnate Forme
 Generation = 5
 #-------------------------------
 [THUNDURUS]
 Name = Thundurus
+FormName = Incarnate Forme
 Types = ELECTRIC,FLYING
 BaseStats = 79,115,70,111,125,80
 GenderRatio = AlwaysMale
@@ -16609,7 +16610,6 @@ Color = Blue
 Shape = HeadArms
 Category = Bolt Strike
 Pokedex = The spikes on its tail discharge immense bolts of lightning. It flies around the Unova region firing off lightning bolts.
-FormName = Incarnate Forme
 Generation = 5
 #-------------------------------
 [RESHIRAM]
@@ -16660,6 +16660,7 @@ Generation = 5
 #-------------------------------
 [LANDORUS]
 Name = Landorus
+FormName = Incarnate Forme
 Types = GROUND,FLYING
 BaseStats = 89,125,90,101,115,80
 GenderRatio = AlwaysMale
@@ -16680,7 +16681,6 @@ Color = Brown
 Shape = HeadArms
 Category = Abundance
 Pokedex = The energy that comes pouring from its tail increases the nutrition in the soil, making crops grow to great size.
-FormName = Incarnate Forme
 Generation = 5
 #-------------------------------
 [KYUREM]
@@ -16708,6 +16708,7 @@ Generation = 5
 #-------------------------------
 [KELDEO]
 Name = Keldeo
+FormName = Ordinary Form
 Types = WATER,FIGHTING
 BaseStats = 91,72,90,108,129,90
 GenderRatio = Genderless
@@ -16727,11 +16728,11 @@ Color = Yellow
 Shape = Quadruped
 Category = Colt
 Pokedex = It crosses the world, running over the surfaces of oceans and rivers. It appears at scenic waterfronts.
-FormName = Ordinary Form
 Generation = 5
 #-------------------------------
 [MELOETTA]
 Name = Meloetta
+FormName = Aria Forme
 Types = NORMAL,PSYCHIC
 BaseStats = 100,77,77,90,128,128
 GenderRatio = Genderless
@@ -16751,7 +16752,6 @@ Color = White
 Shape = Bipedal
 Category = Melody
 Pokedex = Many famous songs have been inspired by the melodies that Meloetta plays.
-FormName = Aria Forme
 Generation = 5
 WildItemCommon = STARPIECE
 WildItemUncommon = STARPIECE
@@ -16759,6 +16759,7 @@ WildItemRare = STARPIECE
 #-------------------------------
 [GENESECT]
 Name = Genesect
+FormName = Normal
 Types = BUG,STEEL
 BaseStats = 71,120,95,99,120,95
 GenderRatio = Genderless
@@ -16778,7 +16779,6 @@ Color = Purple
 Shape = Bipedal
 Category = Paleozoic
 Pokedex = This ancient bug Pokémon was altered by Team Plasma. They upgraded the cannon on its back.
-FormName = Normal
 Generation = 5
 #-------------------------------
 [CHESPIN]
@@ -17184,6 +17184,7 @@ Evolutions = VIVILLON,Level,12
 #-------------------------------
 [VIVILLON]
 Name = Vivillon
+FormName = Archipelago Pattern
 Types = BUG,FLYING
 BaseStats = 80,52,50,89,90,50
 GenderRatio = Female50Percent
@@ -17204,7 +17205,6 @@ Color = White
 Shape = MultiWinged
 Category = Scale
 Pokedex = Vivillon with many different patterns are found all over the world. These patterns are affected by the climate of their habitat.
-FormName = Archipelago Pattern
 Generation = 6
 #-------------------------------
 [LITLEO]
@@ -17259,6 +17259,7 @@ Generation = 6
 #-------------------------------
 [FLABEBE]
 Name = Flabébé
+FormName = Red Flower
 Types = FAIRY
 BaseStats = 44,38,39,42,61,79
 GenderRatio = AlwaysFemale
@@ -17280,13 +17281,13 @@ Color = White
 Shape = HeadArms
 Category = Single Bloom
 Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart.
-FormName = Red Flower
 Generation = 6
 Flags = InheritFormFromMother
 Evolutions = FLOETTE,Level,19
 #-------------------------------
 [FLOETTE]
 Name = Floette
+FormName = Red Flower
 Types = FAIRY
 BaseStats = 54,45,47,52,75,98
 GenderRatio = AlwaysFemale
@@ -17307,13 +17308,13 @@ Color = White
 Shape = HeadArms
 Category = Single Bloom
 Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.
-FormName = Red Flower
 Generation = 6
 Flags = InheritFormFromMother
 Evolutions = FLORGES,Item,SHINYSTONE
 #-------------------------------
 [FLORGES]
 Name = Florges
+FormName = Red Flower
 Types = FAIRY
 BaseStats = 78,65,68,75,112,154
 GenderRatio = AlwaysFemale
@@ -17334,7 +17335,6 @@ Color = White
 Shape = HeadArms
 Category = Garden
 Pokedex = It claims exquisite flower gardens as its territory, and it obtains power from basking in the energy emitted by flowering plants.
-FormName = Red Flower
 Generation = 6
 Flags = InheritFormFromMother
 #-------------------------------
@@ -17442,6 +17442,7 @@ WildItemUncommon = MENTALHERB
 #-------------------------------
 [FURFROU]
 Name = Furfrou
+FormName = Natural Form
 Types = NORMAL
 BaseStats = 75,80,60,102,65,90
 GenderRatio = Female50Percent
@@ -17462,7 +17463,6 @@ Color = White
 Shape = Quadruped
 Category = Poodle
 Pokedex = Trimming its fluffy fur not only makes it more elegant but also increases the swiftness of its movements.
-FormName = Natural Form
 Generation = 6
 #-------------------------------
 [ESPURR]
@@ -17493,6 +17493,7 @@ Evolutions = MEOWSTIC,Level,25
 #-------------------------------
 [MEOWSTIC]
 Name = Meowstic
+FormName = Male
 Types = PSYCHIC
 BaseStats = 74,48,76,104,83,81
 GenderRatio = Female50Percent
@@ -17513,7 +17514,6 @@ Color = Blue
 Shape = BipedalTail
 Category = Constraint
 Pokedex = Revealing the eyelike patterns on the insides of its ears will unleash its psychic powers. It normally keeps the patterns hidden, however.
-FormName = Male
 Generation = 6
 #-------------------------------
 [HONEDGE]
@@ -17567,6 +17567,7 @@ Evolutions = AEGISLASH,Item,DUSKSTONE
 #-------------------------------
 [AEGISLASH]
 Name = Aegislash
+FormName = Shield Forme
 Types = STEEL,GHOST
 BaseStats = 60,50,140,60,50,140
 GenderRatio = Female50Percent
@@ -17586,7 +17587,6 @@ Color = Brown
 Shape = HeadBase
 Category = Royal Sword
 Pokedex = In this defensive stance, Aegislash uses its steel body and a force field of spectral power to reduce the damage of any attack.
-FormName = Shield Forme
 Generation = 6
 #-------------------------------
 [SPRITZEE]
@@ -18290,6 +18290,7 @@ Generation = 6
 #-------------------------------
 [PUMPKABOO]
 Name = Pumpkaboo
+FormName = Small Size
 Types = GHOST,GRASS
 BaseStats = 44,66,70,56,44,55
 GenderRatio = Female50Percent
@@ -18310,13 +18311,13 @@ Color = Brown
 Shape = Head
 Category = Pumpkin
 Pokedex = When taking spirits to the afterlife, small Pumpkaboo prefer the spirits of children to those of adults.
-FormName = Small Size
 Generation = 6
 Flags = InheritFormFromMother
 Evolutions = GOURGEIST,Trade,
 #-------------------------------
 [GOURGEIST]
 Name = Gourgeist
+FormName = Small Size
 Types = GHOST,GRASS
 BaseStats = 55,85,122,99,58,75
 GenderRatio = Female50Percent
@@ -18336,7 +18337,6 @@ Color = Brown
 Shape = HeadBase
 Category = Pumpkin
 Pokedex = Small Gourgeist pretend to be children to fool adults. Anyone who falls for the act gets carried away to the hereafter.
-FormName = Small Size
 Generation = 6
 Flags = InheritFormFromMother
 #-------------------------------
@@ -18442,6 +18442,7 @@ Generation = 6
 #-------------------------------
 [XERNEAS]
 Name = Xerneas
+FormName = Neutral Mode
 Types = FAIRY
 BaseStats = 126,131,95,99,131,98
 GenderRatio = Genderless
@@ -18461,7 +18462,6 @@ Color = Blue
 Shape = Quadruped
 Category = Life
 Pokedex = Legends say it can share eternal life. It slept for a thousand years in the form of a tree before its revival.
-FormName = Neutral Mode
 Generation = 6
 #-------------------------------
 [YVELTAL]
@@ -18489,6 +18489,7 @@ Generation = 6
 #-------------------------------
 [ZYGARDE]
 Name = Zygarde
+FormName = 50% Forme
 Types = DRAGON,GROUND
 BaseStats = 108,100,121,95,81,95
 GenderRatio = Genderless
@@ -18508,7 +18509,6 @@ Color = Green
 Shape = Serpentine
 Category = Order
 Pokedex = It's thought to be monitoring the ecosystem. There are rumors that even greater power lies hidden within it.
-FormName = 50% Forme
 Generation = 6
 #-------------------------------
 [DIANCIE]
@@ -18536,6 +18536,7 @@ Generation = 6
 #-------------------------------
 [HOOPA]
 Name = Hoopa
+FormName = Hoopa Confined
 Types = PSYCHIC,GHOST
 BaseStats = 80,110,60,70,150,130
 GenderRatio = Genderless
@@ -18555,7 +18556,6 @@ Color = Purple
 Shape = HeadArms
 Category = Mischief
 Pokedex = This troublemaker sends anything and everything to faraway places using its loop, which can warp space.
-FormName = Hoopa Confined
 Generation = 6
 #-------------------------------
 [VOLCANION]
@@ -19063,6 +19063,7 @@ WildItemUncommon = CHERIBERRY
 #-------------------------------
 [ORICORIO]
 Name = Oricorio
+FormName = Baile Style
 Types = FIRE,FLYING
 BaseStats = 75,70,70,93,98,70
 GenderRatio = Female75Percent
@@ -19083,7 +19084,6 @@ Color = Red
 Shape = Winged
 Category = Dancing
 Pokedex = It beats its wings together to create fire. As it moves in the steps of its beautiful dance, it bathes opponents in intense flames.
-FormName = Baile Style
 Generation = 7
 Flags = InheritFormFromMother
 WildItemUncommon = HONEY
@@ -19168,6 +19168,7 @@ Evolutions = LYCANROC,Level,25
 #-------------------------------
 [LYCANROC]
 Name = Lycanroc
+FormName = Midday Form
 Types = ROCK
 BaseStats = 75,115,65,112,55,65
 GenderRatio = Female50Percent
@@ -19188,11 +19189,11 @@ Color = Brown
 Shape = Quadruped
 Category = Wolf
 Pokedex = Its quick movements confuse its enemies. Well equipped with claws and fangs, it also uses the sharp rocks in its mane as weapons.
-FormName = Midday Form
 Generation = 7
 #-------------------------------
 [WISHIWASHI]
 Name = Wishiwashi
+FormName = Solo Form
 Types = WATER
 BaseStats = 45,20,20,40,25,25
 GenderRatio = Female50Percent
@@ -19213,7 +19214,6 @@ Color = Blue
 Shape = Finned
 Category = Small Fry
 Pokedex = It's awfully weak and notably tasty, so everyone is always out to get it. As it happens, anyone trying to bully it receives a painful lesson.
-FormName = Solo Form
 Generation = 7
 #-------------------------------
 [MAREANIE]
@@ -19885,6 +19885,7 @@ Evolutions = SILVALLY,Happiness,
 #-------------------------------
 [SILVALLY]
 Name = Silvally
+FormName = Type: Normal
 Types = NORMAL
 BaseStats = 95,95,95,95,95,95
 GenderRatio = Genderless
@@ -19904,11 +19905,11 @@ Color = Gray
 Shape = Quadruped
 Category = Synthetic
 Pokedex = Its trust in its partner is what awakens it. This Pokémon is capable of changing its type, a flexibility that is well displayed in battle.
-FormName = Type: Normal
 Generation = 7
 #-------------------------------
 [MINIOR]
 Name = Minior
+FormName = Meteor Form
 Types = ROCK,FLYING
 BaseStats = 60,60,100,60,60,100
 GenderRatio = Genderless
@@ -19928,7 +19929,6 @@ Color = Brown
 Shape = Head
 Category = Meteor
 Pokedex = Originally making its home in the ozone layer, it hurtles to the ground when the shell enclosing its body grows too heavy.
-FormName = Meteor Form
 Generation = 7
 WildItemUncommon = STARPIECE
 #-------------------------------
@@ -20009,6 +20009,7 @@ WildItemUncommon = ELECTRICSEED
 #-------------------------------
 [MIMIKYU]
 Name = Mimikyu
+FormName = Disguised Form
 Types = GHOST,FAIRY
 BaseStats = 55,90,80,96,50,105
 GenderRatio = Female50Percent
@@ -20029,7 +20030,6 @@ Color = Yellow
 Shape = Serpentine
 Category = Disguise
 Pokedex = A lonely Pokémon, it conceals its terrifying appearance beneath an old rag so it can get closer to people and other Pokémon.
-FormName = Disguised Form
 Generation = 7
 WildItemUncommon = CHESTOBERRY
 #-------------------------------
@@ -21758,6 +21758,7 @@ Evolutions = TOXTRICITY,Level,30
 #-------------------------------
 [TOXTRICITY]
 Name = Toxtricity
+FormName = Amped Form
 Types = ELECTRIC,POISON
 BaseStats = 75,98,70,75,114,70
 GenderRatio = Female50Percent
@@ -21778,7 +21779,6 @@ Color = Purple
 Shape = BipedalTail
 Category = Punk
 Pokedex = When this Pokémon sounds as if it's strumming a guitar, it's actually clawing at the protrusions on its chest to generate electricity.
-FormName = Amped Form
 Generation = 8
 #-------------------------------
 [SIZZLIPEDE]
@@ -21883,6 +21883,7 @@ Generation = 8
 #-------------------------------
 [SINISTEA]
 Name = Sinistea
+FormName = Phony Form
 Types = GHOST
 BaseStats = 40,45,45,50,74,54
 GenderRatio = Genderless
@@ -21903,12 +21904,12 @@ Color = Purple
 Shape = Head
 Category = Black Tea
 Pokedex = The teacup in which this Pokémon makes its home is a famous piece of antique tableware. Many forgeries are in circulation.
-FormName = Phony Form
 Generation = 8
 Evolutions = POLTEAGEIST,Item,CRACKEDPOT
 #-------------------------------
 [POLTEAGEIST]
 Name = Polteageist
+FormName = Phony Form
 Types = GHOST
 BaseStats = 60,65,65,70,134,114
 GenderRatio = Genderless
@@ -21929,7 +21930,6 @@ Color = Purple
 Shape = Head
 Category = Black Tea
 Pokedex = This species lives in antique teapots. Most pots are forgeries, but on rare occasions, an authentic work is found.
-FormName = Phony Form
 Generation = 8
 #-------------------------------
 [HATENNA]
@@ -22265,6 +22265,7 @@ Evolutions = ALCREMIE,HoldItem,STRAWBERRYSWEET,ALCREMIE,HoldItem,BERRYSWEET,ALCR
 #-------------------------------
 [ALCREMIE]
 Name = Alcremie
+FormName = Vanilla Cream
 Types = FAIRY
 BaseStats = 65,60,75,64,110,121
 GenderRatio = AlwaysFemale
@@ -22285,7 +22286,6 @@ Color = White
 Shape = HeadBase
 Category = Cream
 Pokedex = When Alcremie is content, the cream it secretes from its hands becomes sweeter and richer.
-FormName = Vanilla Cream
 Generation = 8
 #-------------------------------
 [FALINKS]
@@ -22414,6 +22414,7 @@ Generation = 8
 #-------------------------------
 [EISCUE]
 Name = Eiscue
+FormName = Ice Face
 Types = ICE
 BaseStats = 75,80,110,50,65,90
 GenderRatio = Female50Percent
@@ -22434,11 +22435,11 @@ Color = Blue
 Shape = BipedalTail
 Category = Penguin
 Pokedex = It drifted in on the flow of ocean waters from a frigid place. It keeps its head iced constantly to make sure it stays nice and cold.
-FormName = Ice Face
 Generation = 8
 #-------------------------------
 [INDEEDEE]
 Name = Indeedee
+FormName = Male
 Types = PSYCHIC,NORMAL
 BaseStats = 60,65,55,95,105,95
 GenderRatio = Female50Percent
@@ -22460,11 +22461,11 @@ Color = Purple
 Shape = BipedalTail
 Category = Emotion
 Pokedex = It uses the horns on its head to sense the emotions of others. Males will act as valets for those they serve, looking after their every need.
-FormName = Male
 Generation = 8
 #-------------------------------
 [MORPEKO]
 Name = Morpeko
+FormName = Full Belly Mode
 Types = ELECTRIC,DARK
 BaseStats = 58,95,58,97,70,58
 GenderRatio = Female50Percent
@@ -22485,7 +22486,6 @@ Color = Yellow
 Shape = Bipedal
 Category = Two-Sided
 Pokedex = As it eats the seeds stored up in its pocket-like pouches, this Pokémon is not just satisfying its constant hunger. It's also generating electricity.
-FormName = Full Belly Mode
 Generation = 8
 #-------------------------------
 [CUFANT]
@@ -22738,6 +22738,7 @@ Generation = 8
 #-------------------------------
 [ZACIAN]
 Name = Zacian
+FormName = Hero of Many Battles
 Types = FAIRY
 BaseStats = 92,130,115,138,80,115
 GenderRatio = Genderless
@@ -22757,7 +22758,6 @@ Color = Blue
 Shape = Quadruped
 Category = Warrior
 Pokedex = Known as a legendary hero, this Pokémon absorbs metal particles, transforming them into a weapon it uses to battle.
-FormName = Hero of Many Battles
 Generation = 8
 WildItemCommon = RUSTEDSWORD
 WildItemUncommon = RUSTEDSWORD
@@ -22765,6 +22765,7 @@ WildItemRare = RUSTEDSWORD
 #-------------------------------
 [ZAMAZENTA]
 Name = Zamazenta
+FormName = Hero of Many Battles
 Types = FIGHTING
 BaseStats = 92,130,115,138,80,115
 GenderRatio = Genderless
@@ -22784,7 +22785,6 @@ Color = Red
 Shape = Quadruped
 Category = Warrior
 Pokedex = This Pokémon slept for aeons while in the form of a statue. It was asleep for so long, people forgot that it ever existed.
-FormName = Hero of Many Battles
 Generation = 8
 WildItemCommon = RUSTEDSHIELD
 WildItemUncommon = RUSTEDSHIELD
@@ -22839,6 +22839,7 @@ Evolutions = URSHIFU,Event,1
 #-------------------------------
 [URSHIFU]
 Name = Urshifu
+FormName = Single Strike Style
 Types = FIGHTING,DARK
 BaseStats = 100,130,100,97,63,60
 GenderRatio = FemaleOneEighth
@@ -22858,7 +22859,6 @@ Color = Gray
 Shape = Bipedal
 Category = Wushu
 Pokedex = Inhabiting the mountains of a distant region, this Pokémon races across sheer cliffs, training its legs and refining its moves.
-FormName = Single Strike Style
 Generation = 8
 #-------------------------------
 [ZARUDE]

PBS/town_map.txt

@@ -3,34 +3,34 @@
 [0]
 Name = Essen
 Filename = mapRegion0.png
-Point = 13,12,Lappet Town,Oak's Lab,2,8,8,
-Point = 13,11,Route 1,,,,,
-Point = 13,10,Cedolan City,Cedolan Dept. Store,7,47,11,
-Point = 14,10,Cedolan City,,7,47,11,
-Point = 14,9,Route 2,,,,,
-Point = 14,8,Route 2,,,,,
-Point = 15,8,Lerucean Town,,23,11,15,
-Point = 16,8,Natural Park,,,,,
-Point = 15,7,Route 3,,,,,
-Point = 15,6,Route 3,Ice Cave,,,,
-Point = 14,6,Route 3,,,,,
-Point = 13,6,Ingido Plateau,,35,17,7,
-Point = 12,6,Route 4,,,,,
-Point = 11,6,Route 4,,,,,
-Point = 11,7,Route 5,Cycle Road,,,,
-Point = 11,8,Route 5,Cycle Road,,,,
-Point = 11,9,Route 5,Cycle Road,,,,
-Point = 11,10,Route 6,,,,,
-Point = 12,10,Route 6,,,,,
-Point = 15,10,Route 7,,,,,
-Point = 16,10,Route 7,Rock Cave,,,,
-Point = 17,10,Battle Frontier,,52,17,14,
-Point = 12,12,Safari Zone,,,,,
-Point = 13,13,Route 8,Diving area,,,,
-Point = 18,17,Berth Island,,,,,51
-Point = 22,16,Faraday Island,,,,,52
+Point = 13,12,Lappet Town,Oak's Lab,2,8,8
+Point = 13,11,Route 1,
+Point = 13,10,Cedolan City,Cedolan Dept. Store,7,47,11
+Point = 14,10,Cedolan City,,7,47,11
+Point = 14,9,Route 2,
+Point = 14,8,Route 2,
+Point = 15,8,Lerucean Town,,23,11,15
+Point = 16,8,Natural Park,
+Point = 15,7,Route 3,
+Point = 15,6,Route 3,Ice Cave
+Point = 14,6,Route 3,
+Point = 13,6,Ingido Plateau,,35,17,7
+Point = 12,6,Route 4,
+Point = 11,6,Route 4,
+Point = 11,7,Route 5,Cycle Road
+Point = 11,8,Route 5,Cycle Road
+Point = 11,9,Route 5,Cycle Road
+Point = 11,10,Route 6,
+Point = 12,10,Route 6,
+Point = 15,10,Route 7,
+Point = 16,10,Route 7,Rock Cave
+Point = 17,10,Battle Frontier,,52,17,14
+Point = 12,12,Safari Zone,
+Point = 13,13,Route 8,Diving area
+Point = 18,17,Berth Island,,51
+Point = 22,16,Faraday Island,,52
 #-------------------------------
 [1]
 Name = Tiall
 Filename = mapRegion1.png
-Point = 13,16,Here,,,,,
+Point = 13,16,Here,