Migrate a reorganizes bunch of files from PIF

2025-12-12 23:44:58 +00:00 · 2025-04-24 19:46:52 -04:00
parent 682323e255
commit 95ef337de8
90 changed files with 31218 additions and 28195 deletions
--- a/backup/items.txt
+++ b/backup/items.txt
--- a/backup/pokemon.txt
+++ b/backup/pokemon.txt
--- a/backup/pokemon_forms.txt
+++ b/backup/pokemon_forms.txt
@@ -3,7 +3,7 @@
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolution = PIKACHU,None
+Evolutions = PIKACHU,None,
 #-------------------------------
 [UNOWN,1]
 FormName = B
--- a/backup/items.txt
+++ b/backup/items.txt
--- a/backup/pokemon.txt
+++ b/backup/pokemon.txt
--- a/backup/pokemon_forms.txt
+++ b/backup/pokemon_forms.txt
@@ -168,7 +168,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolution = PIKACHU,None
+Evolutions = PIKACHU,None,
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -276,7 +276,7 @@ Generation = 6
 [SCIZOR,1]
 FormName = Mega Scizor
 MegaStone = SCIZORITE
-BaseStats = 70,150,140,75,65,100
+BaseStats = 70,150,140,65,100,75
 Abilities = TECHNICIAN
 HiddenAbilities = TECHNICIAN
 Height = 2.0
@@ -1003,7 +1003,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolution = FLORGES,None
+Evolutions = FLORGES,None,
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
--- a/backup/items.txt
+++ b/backup/items.txt
--- a/backup/pokemon.txt
+++ b/backup/pokemon.txt
--- a/backup/pokemon_forms.txt
+++ b/backup/pokemon_forms.txt
@@ -82,9 +82,9 @@ Weight = 3.8
 Color = Black
 Pokedex = With its incisors, it gnaws through doors and infiltrates people's homes. Then, with a twitch of its whiskers, it steals whatever food it finds.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = PECHABERRY
-Evolution = RATICATE,LevelNight,20
+Evolutions = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
@@ -97,7 +97,7 @@ Weight = 25.5
 Color = Black
 Pokedex = It forms a group of Rattata, which it assumes command of. Each group has its own territory, and disputes over food happen often.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
@@ -128,8 +128,8 @@ Weight = 40.0
 Color = White
 Pokedex = The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
-Evolution = SANDSLASH,Item,ICESTONE
+Flags = InheritFormWithEverStone
+Evolutions = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
@@ -144,7 +144,7 @@ Weight = 55.0
 Color = Blue
 Pokedex = It runs across snow-covered plains at high speeds. It developed thick, sharp claws to plow through the snow.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
@@ -157,9 +157,9 @@ EggMoves = AGILITY,CHARM,DISABLE,ENCORE,EXTRASENSORY,FLAIL,FREEZEDRY,HOWL,HYPNOS
 Color = White
 Pokedex = In hot weather, this Pokémon makes ice shards with its six tails and sprays them around to cool itself off.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = SNOWBALL
-Evolution = NINETALES,Item,ICESTONE
+Evolutions = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
@@ -173,7 +173,7 @@ TutorMoves = AQUATAIL,ATTRACT,AURORAVEIL,BLIZZARD,BODYSLAM,CALMMIND,CAPTIVATE,CO
 Color = Blue
 Pokedex = It lives on mountains perpetually covered in snow and is revered as a deity incarnate. It appears draped in a blizzard.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
@@ -187,7 +187,7 @@ EggMoves = ANCIENTPOWER,BEATUP,ENDURE,FEINTATTACK,FINALGAMBIT,HEADBUTT,MEMENTO,M
 Weight = 1.0
 Pokedex = Its head sports an altered form of whiskers made of metal. When in communication with its comrades, its whiskers wobble to and fro.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
@@ -200,7 +200,7 @@ TutorMoves = AERIALACE,ATTRACT,BODYSLAM,BULLDOZE,CAPTIVATE,CONFIDE,CUT,DIG,DOUBL
 Weight = 66.6
 Pokedex = Its shining gold hair provides it with protection. It's reputed that keeping any of its fallen hairs will bring bad luck.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
@@ -213,8 +213,8 @@ EggMoves = AMNESIA,ASSIST,CHARM,COVET,FLAIL,FLATTER,FOULPLAY,HYPNOSIS,PARTINGSHO
 Color = Blue
 Pokedex = It's impulsive, selfish, and fickle. It's very popular with some Trainers who like giving it the attention it needs.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
-Evolution = PERSIAN,Happiness
+Flags = InheritFormWithEverStone
+Evolutions = PERSIAN,Happiness,
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
@@ -229,7 +229,7 @@ Weight = 33.0
 Color = Blue
 Pokedex = Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [ALAKAZAM,1]
 FormName = Mega Alakazam
@@ -254,7 +254,7 @@ Weight = 20.3
 Color = Gray
 Pokedex = Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
@@ -268,7 +268,7 @@ Weight = 110.0
 Color = Gray
 Pokedex = They eat rocks and often get into a scrap over them. The shock of Graveler smashing together causes a flash of light and a booming noise.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
@@ -283,7 +283,7 @@ Weight = 316.0
 Color = Gray
 Pokedex = It fires rocks charged with electricity. Even if the rock isn't fired that accurately, just grazing an opponent will cause numbness and fainting.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemCommon = CELLBATTERY
 #-------------------------------
 [SLOWBRO,1]
@@ -312,7 +312,7 @@ Weight = 42.0
 Color = Green
 Pokedex = A Grimer, which had been brought in to solve a problem with garbage, developed over time into this form.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
@@ -326,7 +326,7 @@ Weight = 52.0
 Color = Green
 Pokedex = The garbage it eats causes continuous chemical changes in its body, which produce its exceedingly vivid coloration.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [GENGAR,1]
 FormName = Mega Gengar
@@ -353,7 +353,7 @@ Generation = 7
 #-------------------------------
 [CUBONE,1]
 Generation = 7
-Evolution = MAROWAK,LevelNight,28
+Evolutions = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
@@ -444,7 +444,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolution = PIKACHU,None
+Evolutions = PIKACHU,None,
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -554,7 +554,7 @@ Generation = 6
 [SCIZOR,1]
 FormName = Mega Scizor
 MegaStone = SCIZORITE
-BaseStats = 70,150,140,75,65,100
+BaseStats = 70,150,140,65,100,75
 BaseExp = 210
 Abilities = TECHNICIAN
 HiddenAbilities = TECHNICIAN
@@ -1337,7 +1337,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,1,FAIRYWIND,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolution = FLORGES,None
+Evolutions = FLORGES,None,
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
@@ -1515,7 +1515,7 @@ Pokedex = It summons the dead with its dreamy dancing. From their malice, it dra
 Abilities = OWNTEMPO
 HiddenAbilities = OWNTEMPO
 Flags = InheritFormFromMother
-Evolution = LYCANROC,LevelEvening,25
+Evolutions = LYCANROC,LevelEvening,25
 #-------------------------------
 [LYCANROC,1]
 FormName = Midnight Form
--- a/backup/items.txt
+++ b/backup/items.txt
--- a/backup/moves.txt
+++ b/backup/moves.txt
@@ -479,7 +479,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = AlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
 Description = Strikes with a fierce blow through mastery of the Dark style. Always results in a critical hit.
 #-------------------------------
 [LASHOUT]
@@ -519,19 +519,6 @@ FunctionCode = FailsIfTargetActed
 Flags = Contact,CanProtect,CanMirrorMove
 Description = This move enables the user to attack first. It fails if the target is not readying an attack, however.
 #-------------------------------
-[CEASELESSEDGE]
-Name = Ceaseless Edge
-Type = DARK
-Category = Physical
-Power = 65
-Accuracy = 90
-TotalPP = 15
-Target = NearOther
-FunctionCode = AddSpikesToFoeSide
-Flags = Contact,CanProtect,CanMirrorMove,Slicing
-EffectChance = 100
-Description = The user slashes its shell blade at the target. This leaves shell splinters under the target as spikes.
-#-------------------------------
 [KNOCKOFF]
 Name = Knock Off
 Type = DARK
@@ -1221,19 +1208,6 @@ FunctionCode = NormalMovesBecomeElectric
 Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
 Description = The user attacks with electrically charged fists. Normal-type moves become Electric-type.
 #-------------------------------
-[WILDBOLTSTORM]
-Name = Wildbolt Storm
-Type = ELECTRIC
-Category = Special
-Power = 100
-Accuracy = 80
-TotalPP = 10
-Target = AllNearFoes
-FunctionCode = ParalyzeTargetAlwaysHitsInRain
-Flags = CanProtect,CanMirrorMove,Wind
-EffectChance = 20
-Description = The user savagely attacks with lightning and wind. This may also leave the opponents with paralysis.
-#-------------------------------
 [THUNDERBOLT]
 Name = Thunderbolt
 Type = ELECTRIC
@@ -1592,19 +1566,6 @@ FunctionCode = UserFaintsPowersUpInMistyTerrainExplosive
 Flags = CanProtect,CanMirrorMove
 Description = The user attacks everything around and faints upon using this move. Power increases on Misty Terrain.
 #-------------------------------
-[SPRINGTIDESTORM]
-Name = Springtide Storm
-Type = FAIRY
-Category = Special
-Power = 100
-Accuracy = 80
-TotalPP = 5
-Target = AllNearFoes
-FunctionCode = LowerTargetAttack1
-Flags = Wind,CanProtect,CanMirrorMove,CannotMetronome
-EffectChance = 30
-Description = The user attacks with fierce winds brimming with love and hate. This may also lower foes' Attack stats.
-#-------------------------------
 [MOONBLAST]
 Name = Moonblast
 Type = FAIRY
@@ -2005,19 +1966,6 @@ Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
 EffectChance = 100
 Description = Overwhelms the target with lightning-like movement, then kicks. Lowers the target's Defense stat.
 #-------------------------------
-[TRIPLEARROWS]
-Name = Triple Arrows
-Type = FIGHTING
-Category = Physical
-Power = 90
-Accuracy = 100
-TotalPP = 10
-Target = NearOther
-FunctionCode = LowerTargetDefense1FlinchTarget
-Flags = CanProtect,CanMirrorMove,HighCriticalHitRate
-EffectChance = 101
-Description = This move is more likely to be a critical hit, and may also lower the target's Defense stat or make it flinch.
-#-------------------------------
 [SECRETSWORD]
 Name = Secret Sword
 Type = FIGHTING
@@ -2439,17 +2387,6 @@ Priority = 3
 FunctionCode = ProtectUserSideFromPriorityMoves
 Description = The user protects itself and its allies from priority moves. If may fail if used in succession.
 #-------------------------------
-[VICTORYDANCE]
-Name = Victory Dance
-Type = FIGHTING
-Category = Status
-Accuracy = 0
-TotalPP = 10
-Target = User
-FunctionCode = RaiseUserAtkDefSpd1
-Flags = Dance
-Description = The user dances intensely to usher in victory, boosting its Attack, Defense and Speed stats.
-#-------------------------------
 [VCREATE]
 Name = V-create
 Type = FIRE
@@ -2574,18 +2511,6 @@ Flags = CanProtect,CanMirrorMove,ThawsUser,Bomb,CannotMetronome
 EffectChance = 10
 Description = Attacks by igniting a small stone and launching it as a fiery ball. May also burn the target.
 #-------------------------------
-[RAGINGFURY]
-Name = Raging Fury
-Type = FIRE
-Category = Physical
-Power = 120
-Accuracy = 100
-TotalPP = 10
-Target = RandomNearFoe
-FunctionCode = MultiTurnAttackConfuseUserAtEnd
-Flags = CanProtect,CanMirrorMove,CannotMetronome
-Description = The user rampages around spewing flames for two to three turns. The user then becomes confused.
-#-------------------------------
 [FIREBLAST]
 Name = Fire Blast
 Type = FIRE
@@ -2987,19 +2912,6 @@ FunctionCode = BurnAttackerBeforeUserActs
 Flags = CanProtect,Bomb
 Description = The user heats up its beak before attacking. Making contact in this time results in a burn.
 #-------------------------------
-[BLEAKWINDSTORM]
-Name = Bleakwind Storm
-Type = FLYING
-Category = Special
-Power = 100
-Accuracy = 80
-TotalPP = 10
-Target = AllNearFoes
-FunctionCode = LowerTargetSpeed1AlwaysHitsInRain
-Flags = CanProtect,CanMirrorMove,Wind
-EffectChance = 30
-Description = The user attacks with savagely cold winds. This may also lower the Speed stats of opposing Pokémon.
-#-------------------------------
 [FLY]
 Name = Fly
 Type = FLYING
@@ -3346,19 +3258,6 @@ Flags = CanProtect,CanMirrorMove
 EffectChance = 100
 Description = The user attacks while also stitching the target's shadow to the ground to prevent it fleeing.
 #-------------------------------
-[BITTERMALICE]
-Name = Bitter Malice
-Type = GHOST
-Category = Special
-Power = 75
-Accuracy = 100
-TotalPP = 10
-Target = NearOther
-FunctionCode = LowerTargetAttack1
-Flags = CanProtect,CanMirrorMove
-EffectChance = 100
-Description = The user attacks the target with spine-chilling resentment. This also lowers the target's Attack stat.
-#-------------------------------
 [SHADOWCLAW]
 Name = Shadow Claw
 Type = GHOST
@@ -3383,19 +3282,6 @@ FunctionCode = DoublePowerIfTargetStatusProblem
 Flags = CanProtect,CanMirrorMove
 Description = This relentless attack does massive damage to a target affected by status problems.
 #-------------------------------
-[INFERNALPARADE]
-Name = Infernal Parade
-Type = GHOST
-Category = Special
-Power = 60
-Accuracy = 100
-TotalPP = 15
-Target = NearOther
-FunctionCode = DoublePowerIfTargetStatusProblemBurnTarget
-Flags = CanProtect,CanMirrorMove
-EffectChance = 30
-Description = The user attacks with fireballs that may cause a burn. Power doubles if the target has a status problem.
-#-------------------------------
 [OMINOUSWIND]
 Name = Ominous Wind
 Type = GHOST
@@ -3546,18 +3432,6 @@ FunctionCode = AddGhostTypeToTarget
 Flags = CanProtect,CanMirrorMove
 Description = The user takes the target trick-or-treating. This adds Ghost type to the target's type.
 #-------------------------------
-[CHLOROBLAST]
-Name = Chloroblast
-Type = GRASS
-Category = Special
-Power = 150
-Accuracy = 95
-TotalPP = 5
-Target = NearOther
-FunctionCode = RecoilHalfOfTotalHP
-Flags = CanProtect,CanMirrorMove
-Description = The user launches its amassed chlorophyll to inflict damage on the target. This also damages the user.
-#-------------------------------
 [FRENZYPLANT]
 Name = Frenzy Plant
 Type = GRASS
@@ -4121,18 +3995,6 @@ FunctionCode = SetTargetAbilityToInsomnia
 Flags = CanProtect,CanMirrorMove
 Description = A seed that causes worry is planted on the foe. It prevents sleep by making its Ability Insomnia.
 #-------------------------------
-[HEADLONGRUSH]
-Name = Headlong Rush
-Type = GROUND
-Category = Physical
-Power = 120
-Accuracy = 100
-TotalPP = 5
-Target = NearOther
-FunctionCode = LowerUserDefSpDef1
-Flags = Contact,CanProtect,CanMirrorMove,Punching
-Description = The user smashes into the target in a full-body tackle. This also lowers the user's Defense and Sp. Def.
-#-------------------------------
 [PRECIPICEBLADES]
 Name = Precipice Blades
 Type = GROUND
@@ -4157,19 +4019,6 @@ FunctionCode = DoublePowerIfTargetUnderground
 Flags = CanProtect,CanMirrorMove
 Description = The user sets off an earthquake that strikes every Pokémon around it.
 #-------------------------------
-[SANDSEARSTORM]
-Name = Sandsear Storm
-Type = GROUND
-Category = Special
-Power = 100
-Accuracy = 80
-TotalPP = 10
-Target = AllNearFoes
-FunctionCode = BurnTargetAlwaysHitsInRain
-Flags = CanProtect,CanMirrorMove,Wind
-EffectChance = 20
-Description = The user wraps opposing Pokémon in searingly hot sand. This may also leave them with a burn.
-#-------------------------------
 [HIGHHORSEPOWER]
 Name = High Horsepower
 Type = GROUND
@@ -4519,19 +4368,6 @@ FunctionCode = LowerUserSpeed1
 Flags = Contact,CanProtect,CanMirrorMove,Punching
 Description = The user swings and hits with its strong, heavy fist. It lowers the user's Speed, however.
 #-------------------------------
-[MOUNTAINGALE]
-Name = Mountain Gale
-Type = ICE
-Category = Physical
-Power = 100
-Accuracy = 85
-TotalPP = 10
-Target = NearOther
-FunctionCode = FlinchTarget
-Flags = CanProtect,CanMirrorMove
-EffectChance = 30
-Description = The user hurls giant chunks of ice at the target. This may also make the target flinch.
-#-------------------------------
 [ICEBEAM]
 Name = Ice Beam
 Type = ICE
@@ -6408,17 +6244,6 @@ FunctionCode = LowerTargetAttack1BypassSubstitute
 Flags = CanMirrorMove
 Description = The user and target become friends. The target loses its will to fight, lowering its Attack stat.
 #-------------------------------
-[POWERSHIFT]
-Name = Power Shift
-Type = NORMAL
-Category = Status
-Accuracy = 0
-TotalPP = 10
-Target = User
-FunctionCode = UserSwapBaseAtkDef
-Flags = CanMirrorMove,CannotMetronome
-Description = The user swaps its Attack and Defense stats.
-#-------------------------------
 [PROTECT]
 Name = Protect
 Type = NORMAL
@@ -6895,19 +6720,6 @@ Flags = CanProtect,CanMirrorMove,Bomb
 EffectChance = 30
 Description = Unsanitary sludge is hurled at the target. It may also poison the target.
 #-------------------------------
-[DIRECLAW]
-Name = Dire Claw
-Type = POISON
-Category = Physical
-Power = 80
-Accuracy = 100
-TotalPP = 15
-Target = NearOther
-FunctionCode = PoisonParalyzeOrSleepTarget
-Flags = Contact,CanProtect,CanMirrorMove
-EffectChance = 50
-Description = The user lashes out with ruinous claws. This may also leave the target poisoned, paralyzed or asleep.
-#-------------------------------
 [POISONJAB]
 Name = Poison Jab
 Type = POISON
@@ -6959,19 +6771,6 @@ FunctionCode = DoublePowerIfTargetPoisoned
 Flags = CanProtect,CanMirrorMove
 Description = The user drenches the foe in a special poisonous liquid. Its power doubles if the target is poisoned.
 #-------------------------------
-[BARBBARRAGE]
-Name = Barb Barrage
-Type = POISON
-Category = Physical
-Power = 60
-Accuracy = 100
-TotalPP = 10
-Target = NearOther
-FunctionCode = DoublePowerIfTargetPoisonedPoisonTarget
-Flags = CanProtect,CanMirrorMove
-EffectChance = 50
-Description = The user fires toxic barbs that may poison the target. Power is doubled if the target is already poisoned.
-#-------------------------------
 [CLEARSMOG]
 Name = Clear Smog
 Type = POISON
@@ -7325,19 +7124,6 @@ Flags = CanProtect,CanMirrorMove,Sound
 EffectChance = 100
 Description = The user attacks with tremendous psychic power. This also removes 3 PP from the target's last move.
 #-------------------------------
-[ESPERWING]
-Name = Esper Wing
-Type = PSYCHIC
-Category = Special
-Power = 80
-Accuracy = 100
-TotalPP = 10
-Target = NearOther
-FunctionCode = RaiseUserSpeed1
-Flags = CanProtect,CanMirrorMove,HighCriticalHitRate
-EffectChance = 100
-Description = The user slashes with aura-enriched wings, and boosts the user's Speed stat. High critical hit chance.
-#-------------------------------
 [EXPANDINGFORCE]
 Name = Expanding Force
 Type = PSYCHIC
@@ -7426,19 +7212,6 @@ Flags = CanProtect,CanMirrorMove,Bomb
 EffectChance = 50
 Description = A mistlike flurry of down envelops and damages the target. It may also lower the target's Sp. Atk.
 #-------------------------------
-[MYSTICALPOWER]
-Name = Mystical Power
-Type = PSYCHIC
-Category = Special
-Power = 70
-Accuracy = 90
-TotalPP = 10
-Target = NearOther
-FunctionCode = RaiseUserSpAtk1
-Flags = CanProtect,CanMirrorMove
-EffectChance = 100
-Description = The user attacks by emitting a mysterious power. This also boosts the user's Sp. Atk stat.
-#-------------------------------
 [PSYCHOCUT]
 Name = Psycho Cut
 Type = PSYCHIC
@@ -7451,19 +7224,6 @@ FunctionCode = None
 Flags = CanProtect,CanMirrorMove,HighCriticalHitRate
 Description = The user tears at the target with blades formed by psychic power. Critical hits land more easily.
 #-------------------------------
-[PSYSHIELDBASH]
-Name = Psyshield Bash
-Type = PSYCHIC
-Category = Physical
-Power = 70
-Accuracy = 90
-TotalPP = 10
-Target = NearOther
-FunctionCode = RaiseUserDefense1
-Flags = Contact,CanProtect,CanMirrorMove
-EffectChance = 100
-Description = The user slams into the target cloaked in psychic energy. This also boosts the user's Defense stat.
-#-------------------------------
 [PSYBEAM]
 Name = Psybeam
 Type = PSYCHIC
@@ -7729,16 +7489,6 @@ Target = UserSide
 FunctionCode = StartWeakenSpecialDamageAgainstUserSide
 Description = A wondrous wall of light is put up to suppress damage from special attacks for five turns.
 #-------------------------------
-[LUNARBLESSING]
-Name = Lunar Blessing
-Type = PSYCHIC
-Category = Status
-Accuracy = 0
-TotalPP = 5
-Target = UserAndAllies
-FunctionCode = HealUserAndAlliesQuarterOfTotalHPCureStatus
-Description = The user receives a blessing from the moon, healing HP and status problems for itself and its allies.
-#-------------------------------
 [LUNARDANCE]
 Name = Lunar Dance
 Type = PSYCHIC
@@ -7909,16 +7659,6 @@ FunctionCode = UserTargetSwapBaseSpeed
 Flags = CanProtect,CanMirrorMove
 Description = The user exchanges Speed stats with the target.
 #-------------------------------
-[TAKEHEART]
-Name = Take Heart
-Type = PSYCHIC
-Category = Status
-Accuracy = 0
-TotalPP = 10
-Target = User
-FunctionCode = RaiseUserSpAtkSpDef1CureStatus
-Description = The user lifts its spirits, curing its own status conditions and boosting its Sp. Atk and Sp. Def stats.
-#-------------------------------
 [TELEKINESIS]
 Name = Telekinesis
 Type = PSYCHIC
@@ -8062,19 +7802,6 @@ Flags = CanProtect,CanMirrorMove
 EffectChance = 30
 Description = Large boulders are hurled at the foes to inflict damage. It may also make the targets flinch.
 #-------------------------------
-[STONEAXE]
-Name = Stone Axe
-Type = ROCK
-Category = Physical
-Power = 65
-Accuracy = 90
-TotalPP = 15
-Target = NearOther
-FunctionCode = AddStealthRocksToFoeSide
-Flags = Contact,CanProtect,CanMirrorMove,Slicing
-EffectChance = 100
-Description = The user swings its stone axes at the target. It leaves stone splinters around the target.
-#-------------------------------
 [ANCIENTPOWER]
 Name = Ancient Power
 Type = ROCK
@@ -8539,16 +8266,6 @@ FunctionCode = LowerTargetSpDef2
 Flags = CanProtect,CanMirrorMove,Sound
 Description = A horrible sound like scraping metal harshly reduces the target's Sp. Def stat.
 #-------------------------------
-[SHELTER]
-Name = Shelter
-Type = STEEL
-Category = Status
-Accuracy = 0
-TotalPP = 10
-Target = User
-FunctionCode = RaiseUserDefense2
-Description = The user makes its skin as hard as an iron shield, sharply boosting its Defense stat.
-#-------------------------------
 [SHIFTGEAR]
 Name = Shift Gear
 Type = STEEL
@@ -8583,18 +8300,6 @@ FunctionCode = PowerHigherWithUserHP
 Flags = CanProtect,CanMirrorMove
 Description = The user spouts water to damage the foe. The lower the user's HP, the less powerful it becomes.
 #-------------------------------
-[WAVECRASH]
-Name = Wave Crash
-Type = WATER
-Category = Physical
-Power = 120
-Accuracy = 100
-TotalPP = 10
-Target = NearOther
-FunctionCode = RecoilThirdOfDamageDealt
-Flags = Contact,CanProtect,CanMirrorMove
-Description = The user shrouds itself in water and slams with its whole body. This also hurts the user quite a lot.
-#-------------------------------
 [HYDROPUMP]
 Name = Hydro Pump
 Type = WATER
@@ -8703,7 +8408,7 @@ Accuracy = 100
 TotalPP = 10
 Target = NearOther
 FunctionCode = DoublePowerIfTargetNotActed
-Flags = Contact,CanProtect,CanMirrorMove,Biting
+Flags = Contact,CanProtect,CanMirrorMove
 Description = The user rends the target with its hard gills. Power doubles if the user moves first.
 #-------------------------------
 [LIQUIDATION]
@@ -8928,7 +8633,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = HitThreeTimesAlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
 Description = Hits three times in a row with mastery of the Water style. This attack always deals critical hits.
 #-------------------------------
 [WATERSHURIKEN]
--- a/backup/pokemon.txt
+++ b/backup/pokemon.txt
--- a/backup/pokemon_forms.txt
+++ b/backup/pokemon_forms.txt
@@ -82,9 +82,9 @@ Weight = 3.8
 Color = Black
 Pokedex = With its incisors, it gnaws through doors and infiltrates people's homes. Then, with a twitch of its whiskers, it steals whatever food it finds.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = PECHABERRY
-Evolution = RATICATE,LevelNight,20
+Evolutions = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
@@ -97,7 +97,7 @@ Weight = 25.5
 Color = Black
 Pokedex = It forms a group of Rattata, which it assumes command of. Each group has its own territory, and disputes over food happen often.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
@@ -128,8 +128,8 @@ Weight = 40.0
 Color = White
 Pokedex = The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
-Evolution = SANDSLASH,Item,ICESTONE
+Flags = InheritFormWithEverStone
+Evolutions = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
@@ -144,7 +144,7 @@ Weight = 55.0
 Color = Blue
 Pokedex = It runs across snow-covered plains at high speeds. It developed thick, sharp claws to plow through the snow.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
@@ -157,9 +157,9 @@ EggMoves = AGILITY,CHARM,DISABLE,ENCORE,EXTRASENSORY,FLAIL,FREEZEDRY,HOWL,HYPNOS
 Color = White
 Pokedex = In hot weather, this Pokémon makes ice shards with its six tails and sprays them around to cool itself off.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = SNOWBALL
-Evolution = NINETALES,Item,ICESTONE
+Evolutions = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
@@ -173,7 +173,7 @@ TutorMoves = AGILITY,AQUATAIL,ATTRACT,AURORAVEIL,AVALANCHE,BLIZZARD,BODYSLAM,CAL
 Color = Blue
 Pokedex = It lives on mountains perpetually covered in snow and is revered as a deity incarnate. It appears draped in a blizzard.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
@@ -187,7 +187,7 @@ EggMoves = ANCIENTPOWER,BEATUP,ENDURE,FEINTATTACK,FINALGAMBIT,HEADBUTT,MEMENTO,M
 Weight = 1.0
 Pokedex = Its head sports an altered form of whiskers made of metal. When in communication with its comrades, its whiskers wobble to and fro.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
@@ -200,7 +200,7 @@ TutorMoves = AERIALACE,AGILITY,ALLYSWITCH,ASSURANCE,ATTRACT,BEATUP,BODYSLAM,BULL
 Weight = 66.6
 Pokedex = Its shining gold hair provides it with protection. It's reputed that keeping any of its fallen hairs will bring bad luck.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
@@ -213,8 +213,8 @@ EggMoves = AMNESIA,ASSIST,CHARM,COVET,FLAIL,FLATTER,FOULPLAY,HYPNOSIS,PARTINGSHO
 Color = Blue
 Pokedex = It's impulsive, selfish, and fickle. It's very popular with some Trainers who like giving it the attention it needs.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
-Evolution = PERSIAN,Happiness
+Flags = InheritFormWithEverStone
+Evolutions = PERSIAN,Happiness,
 #-------------------------------
 [MEOWTH,2]
 FormName = Galarian
@@ -229,8 +229,8 @@ Color = Brown
 Shape = BipedalTail
 Pokedex = Living with a savage, seafaring people has toughened this Pokémon's body so much that parts of it have turned to iron.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = PERRSERKER,Level,28
+Flags = InheritFormWithEverStone
+Evolutions = PERRSERKER,Level,28
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
@@ -245,34 +245,6 @@ Weight = 33.0
 Color = Blue
 Pokedex = Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.
 Generation = 7
-Flags = InheritFormWithEverstone
-#-------------------------------
-[GROWLITHE,1]
-FormName = Hisuian
-Types = FIRE,ROCK
-BaseStats = 60,75,45,55,65,50
-HiddenAbilities = ROCKHEAD
-Moves = 1,EMBER,1,LEER,4,HOWL,8,BITE,12,FLAMEWHEEL,16,HELPINGHAND,24,FIREFANG,28,RETALIATE,32,CRUNCH,36,TAKEDOWN,40,FLAMETHROWER,44,ROAR,48,ROCKSLIDE,52,REVERSAL,56,FLAREBLITZ
-TutorMoves = AGILITY,BODYSLAM,CLOSECOMBAT,CRUNCH,DIG,DOUBLEEDGE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIRESPIN,FLAMECHARGE,FLAMETHROWER,FLAREBLITZ,HEATWAVE,HELPINGHAND,OUTRAGE,OVERHEAT,POWERGEM,PROTECT,PSYCHICFANGS,REST,REVERSAL,ROAR,ROCKBLAST,ROCKSLIDE,ROCKTOMB,SANDSTORM,SCARYFACE,SCORCHINGSANDS,SLEEPTALK,SMACKDOWN,SMARTSTRIKE,STEALTHROCK,STONEEDGE,SUBSTITUTE,SUNNYDAY,TAKEDOWN,THUNDERFANG,WILDCHARGE,WILLOWISP
-EggMoves = COVET,DOUBLEEDGE,DOUBLEKICK,HEADSMASH,MORNINGSUN,THRASH
-Height = 0.8
-Weight = 22.7
-Category = Scout
-Pokedex = They patrol their territory in pairs. The igneous rock components in the fur of this species are the result of volcanic activity in its habitat.
-Generation = 8
-Flags = EggInRegion_3,InheritFormWithEverStone
-#-------------------------------
-[ARCANINE,1]
-FormName = Hisuian
-Types = FIRE,ROCK
-BaseStats = 95,115,80,90,95,80
-HiddenAbilities = ROCKHEAD
-Moves = 0,EXTREMESPEED,1,FLAMEWHEEL,1,HELPINGHAND,1,AGILITY,1,FIREFANG,1,RETALIATE,1,CRUNCH,1,TAKEDOWN,1,ROAR,1,ROCKSLIDE,1,REVERSAL,1,FLAREBLITZ,1,ROCKTHROW,1,EMBER,1,LEER,1,HOWL,1,BITE,5,FLAMETHROWER,64,RAGINGFURY
-TutorMoves = AERIALACE,AGILITY,BODYSLAM,BULLDOZE,CLOSECOMBAT,CRUNCH,DIG,DOUBLEEDGE,DRAGONPULSE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIRESPIN,FLAMECHARGE,FLAMETHROWER,FLAREBLITZ,GIGAIMPACT,HEATCRASH,HEATWAVE,HELPINGHAND,HYPERBEAM,HYPERVOICE,IRONHEAD,OUTRAGE,OVERHEAT,POWERGEM,PROTECT,PSYCHICFANGS,REST,REVERSAL,ROAR,ROCKBLAST,ROCKSLIDE,ROCKTOMB,SANDSTORM,SCARYFACE,SCORCHINGSANDS,SLEEPTALK,SMACKDOWN,SMARTSTRIKE,SNARL,SOLARBEAM,STEALTHROCK,STONEEDGE,SUBSTITUTE,SUNNYDAY,TAKEDOWN,THIEF,THUNDERFANG,WILDCHARGE,WILLOWISP
-Height = 2.0
-Weight = 168.0
-Pokedex = Snaps at its foes with fangs cloaked in blazing flame. Despite its bulk, it deftly feints every which way, leading opponents on a deceptively merry chase as it all but dances around them.
-Generation = 8
 Flags = InheritFormWithEverStone
 #-------------------------------
 [ALAKAZAM,1]
@@ -298,7 +270,7 @@ Weight = 20.3
 Color = Gray
 Pokedex = Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
@@ -312,7 +284,7 @@ Weight = 110.0
 Color = Gray
 Pokedex = They eat rocks and often get into a scrap over them. The shock of Graveler smashing together causes a flash of light and a booming noise.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
@@ -327,7 +299,7 @@ Weight = 316.0
 Color = Gray
 Pokedex = It fires rocks charged with electricity. Even if the rock isn't fired that accurately, just grazing an opponent will cause numbness and fainting.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemCommon = CELLBATTERY
 #-------------------------------
 [PONYTA,1]
@@ -343,7 +315,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Its small horn hides a healing power. With a few rubs from this Pokémon's horn, any slight wound you have will be healed.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [RAPIDASH,1]
 FormName = Galarian
@@ -357,7 +329,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Little can stand up to its psycho cut. Unleashed from this Pokémon's horn, the move will punch a hole right through a thick metal sheet.
 Generation = 8
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [SLOWPOKE,1]
 FormName = Galarian
@@ -367,9 +339,8 @@ Moves = 1,TACKLE,1,CURSE,3,GROWL,6,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERP
 TutorMoves = AMNESIA,ATTRACT,BLIZZARD,BODYSLAM,BRINE,BULLDOZE,CALMMIND,CAPTIVATE,CONFIDE,DIG,DIVE,DOUBLEEDGE,DOUBLETEAM,EARTHQUAKE,ENDURE,EXPANDINGFORCE,FACADE,FIREBLAST,FLAMETHROWER,FOULPLAY,FRUSTRATION,FUTURESIGHT,GRASSKNOT,HAIL,HIDDENPOWER,HYDROPUMP,ICEBEAM,ICYWIND,IMPRISON,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MIMIC,MUDSHOT,NATURALGIFT,PAYDAY,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYSHOCK,RAINDANCE,REST,RETURN,ROUND,SAFEGUARD,SCALD,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWIFT,THUNDERWAVE,TRIATTACK,TRICK,TRICKROOM,WEATHERBALL,WHIRLPOOL,WONDERROOM,ZENHEADBUTT
 Pokedex = Although this Pokémon is normally zoned out, its expression abruptly sharpens on occasion. The cause for this seems to lie in Slowpoke's diet.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = SLOWBRO,Item,GALARICACUFF
-Evolution = SLOWKING,Item,GALARICAWREATH
+Flags = InheritFormWithEverStone
+Evolutions = SLOWBRO,Item,GALARICACUFF,SLOWKING,Item,GALARICAWREATH
 #-------------------------------
 [SLOWBRO,1]
 FormName = Galarian
@@ -381,7 +352,7 @@ TutorMoves = AMNESIA,ATTRACT,AVALANCHE,BLIZZARD,BODYSLAM,BRICKBREAK,BRINE,BRUTAL
 Weight = 70.5
 Pokedex = If this Pokémon squeezes the tongue of the Shellder biting it, the Shellder will launch a toxic liquid from the tip of its shell.
 Generation = 8
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [SLOWBRO,2]
 FormName = Mega Slowbro
@@ -408,9 +379,9 @@ EggMoves = COUNTER,COVET,CURSE,DOUBLEEDGE,FEINT,FLAIL,NIGHTSLASH,QUICKATTACK,QUI
 Weight = 42.0
 Pokedex = The stalks of leeks are thicker and longer in the Galar region. Farfetch'd that adapted to these stalks took on a unique form.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 WildItemCommon = LEEK
-Evolution = SIRFETCHD,AfterBattleCounter,3
+Evolutions = SIRFETCHD,BattleDealCriticalHit,3
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
@@ -425,7 +396,7 @@ Weight = 42.0
 Color = Green
 Pokedex = A Grimer, which had been brought in to solve a problem with garbage, developed over time into this form.
 Generation = 7
-Flags = EggInRegion_1,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
@@ -439,7 +410,7 @@ Weight = 52.0
 Color = Green
 Pokedex = The garbage it eats causes continuous chemical changes in its body, which produce its exceedingly vivid coloration.
 Generation = 7
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [GENGAR,1]
 FormName = Mega Gengar
@@ -452,30 +423,6 @@ Height = 1.4
 Pokedex = The energy of Mega Evolution awakened it. It sinks into another dimension, where it keeps a patient watch for its chance to attack.
 Generation = 6
 #-------------------------------
-[VOLTORB,1]
-FormName = Hisuian
-Types = ELECTRIC,GRASS
-Moves = 1,CHARGE,1,TACKLE,4,THUNDERSHOCK,6,STUNSPORE,9,BULLETSEED,11,ROLLOUT,13,SCREECH,16,CHARGEBEAM,20,SWIFT,22,ELECTROBALL,26,SELFDESTRUCT,29,ENERGYBALL,34,SEEDBOMB,34,DISCHARGE,41,EXPLOSION,46,GYROBALL,50,GRASSYTERRAIN
-TutorMoves = AGILITY,BULLETSEED,CHARGE,CHARGEBEAM,DOUBLEEDGE,ELECTRICTERRAIN,ELECTROBALL,ELECTROWEB,ENDURE,ENERGYBALL,FACADE,FOULPLAY,GIGADRAIN,GRASSKNOT,GRASSYGLIDE,GRASSYTERRAIN,GYROBALL,LEAFSTORM,PROTECT,RAINDANCE,REFLECT,REST,SEEDBOMB,SLEEPTALK,SOLARBEAM,SUBSTITUTE,SWIFT,TAKEDOWN,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERWAVE,VOLTSWITCH,WILDCHARGE
-EggMoves = LEECHSEED,RECYCLE,WORRYSEED
-Weight = 13.0
-Category = Sphere
-Pokedex = An enigmatic Pokémon that happens to bear a resemblance to a Poké Ball. When excited, it discharges the electric current it has stored in its belly, then lets out a great, uproarious laugh.
-Generation = 8
-Flags = EggInRegion_3,InheritFormWithEverStone
-Evolutions = ELECTRODE,Item,LEAFSTONE
-#-------------------------------
-[ELECTRODE,1]
-FormName = Hisuian
-Types = ELECTRIC,GRASS
-Moves = 0,CHLOROBLAST,1,CHARGE,1,TACKLE,4,THUNDERSHOCK,6,STUNSPORE,9,BULLETSEED,11,ROLLOUT,13,SCREECH,16,CHARGEBEAM,20,SWIFT,22,ELECTROBALL,26,SELFDESTRUCT,29,ENERGYBALL,34,SEEDBOMB,34,DISCHARGE,41,EXPLOSION,46,GYROBALL,50,GRASSYTERRAIN
-TutorMoves = AGILITY,BULLETSEED,CHARGE,CHARGEBEAM,CURSE,DOUBLEEDGE,ELECTRICTERRAIN,ELECTROBALL,ELECTROWEB,ENDURE,ENERGYBALL,FACADE,FOULPLAY,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRASSYGLIDE,GRASSYTERRAIN,GYROBALL,HYPERBEAM,LEAFSTORM,PROTECT,RAINDANCE,REFLECT,REST,SCARYFACE,SEEDBOMB,SLEEPTALK,SOLARBEAM,SUBSTITUTE,SWIFT,TAKEDOWN,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERWAVE,VOLTSWITCH,WILDCHARGE
-Weight = 71.0
-Category = Sphere
-Pokedex = The tissue on the surface of its body is curiously similar in composition to an Apricorn. When irritated, this Pokémon lets loose an electric current equal to 20 lightning bolts.
-Generation = 8
-Flags = InheritFormWithEverStone
-#-------------------------------
 [EXEGGUTOR,1]
 FormName = Alolan
 Types = GRASS,DRAGON
@@ -490,14 +437,14 @@ Generation = 7
 #-------------------------------
 [CUBONE,1]
 Generation = 7
-Evolution = MAROWAK,LevelNight,28
+Evolutions = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
 Types = FIRE,GHOST
 Abilities = CURSEDBODY,LIGHTNINGROD
 HiddenAbilities = ROCKHEAD
-Moves = 1,SHADOWBONE,1,FALSESWIPE,1,HEADBUTT,1,RETALIATE,1,FOCUSENERGY,1,DOUBLEEDGE,1,MUDSLAP,1,GROWL,1,TAILWHIP,1,FIRESPIN,12,FLAMEWHEEL,16,HEX,20,FLING,24,STOMPINGTANTRUM,31,BONERUSH,36,WILLOWISP,42,ENDEAVOR,48,BONEMERANG,54,THRASH,60,FLAREBLITZ
+Moves = 1,GROWL,1,TAILWHIP,1,BONECLUB,1,FLAMEWHEEL,3,TAILWHIP,7,BONECLUB,11,FLAMEWHEEL,13,LEER,17,HEX,21,BONEMERANG,23,WILLOWISP,27,SHADOWBONE,33,THRASH,37,FLING,43,STOMPINGTANTRUM,49,ENDEAVOR,53,FLAREBLITZ,59,RETALIATE,65,BONERUSH
 TutorMoves = AERIALACE,ALLYSWITCH,ATTRACT,BLIZZARD,BODYSLAM,BRICKBREAK,BRUTALSWING,BULLDOZE,BURNINGJEALOUSY,CAPTIVATE,CONFIDE,COUNTER,DARKPULSE,DIG,DOUBLEEDGE,DOUBLETEAM,DREAMEATER,DYNAMICPUNCH,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENDEAVOR,ENDURE,FACADE,FALSESWIPE,FIREBLAST,FIREPUNCH,FIRESPIN,FLAMECHARGE,FLAMETHROWER,FLAREBLITZ,FLING,FOCUSBLAST,FOCUSENERGY,FOCUSPUNCH,FRUSTRATION,FURYCUTTER,GIGAIMPACT,HEADBUTT,HEATWAVE,HEX,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICYWIND,IMPRISON,INCINERATE,IRONDEFENSE,IRONHEAD,IRONTAIL,KNOCKOFF,LASERFOCUS,LOWKICK,MEGAKICK,MEGAPUNCH,MIMIC,MUDSLAP,NATURALGIFT,OUTRAGE,PAINSPLIT,POLTERGEIST,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETALIATE,RETURN,ROCKCLIMB,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SANDSTORM,SCORCHINGSANDS,SCREECH,SECRETPOWER,SEISMICTOSS,SHADOWBALL,SLEEPTALK,SMACKDOWN,SNORE,SPITE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,SWIFT,SWORDSDANCE,THIEF,THROATCHOP,THUNDER,THUNDERBOLT,THUNDERPUNCH,UPROAR,WILLOWISP
 Weight = 34.0
 Color = Purple
@@ -543,8 +490,8 @@ Color = White
 Category = Dancing
 Pokedex = Its talent is tap-dancing. It can also manipulate temperatures to create a floor of ice, which this Pokémon can kick up to use as a barrier.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = MRRIME,Level,42
+Flags = InheritFormWithEverStone
+Evolutions = MRRIME,Level,42
 #-------------------------------
 [PINSIR,1]
 FormName = Mega Pinsir
@@ -653,23 +600,10 @@ Weight = 33.0
 Pokedex = Despite its diminished size, its mental power has grown phenomenally. With a mere thought, it can smash a skyscraper to smithereens.
 Generation = 6
 #-------------------------------
-[TYPHLOSION,1]
-FormName = Hisuian
-Types = FIRE,GHOST
-BaseStats = 73,84,78,95,119,85
-HiddenAbilities = FRISK
-Moves = 0,INFERNALPARADE,1,ERUPTION,1,DOUBLEEDGE,1,GYROBALL,1,TACKLE,1,LEER,1,SMOKESCREEN,1,EMBER,13,QUICKATTACK,20,FLAMEWHEEL,24,DEFENSECURL,31,SWIFT,35,FLAMECHARGE,43,LAVAPLUME,48,FLAMETHROWER,56,INFERNO,61,ROLLOUT,74,OVERHEAT
-TutorMoves = AERIALACE,BLASTBURN,BODYSLAM,BRICKBREAK,BULLDOZE,BURNINGJEALOUSY,CALMMIND,CONFUSERAY,CURSE,DIG,DOUBLEEDGE,EARTHQUAKE,ENDEAVOR,ENDURE,FACADE,FIREBLAST,FIREFANG,FIREPLEDGE,FIREPUNCH,FIRESPIN,FLAMECHARGE,FLAMETHROWER,FLAREBLITZ,FOCUSBLAST,FOCUSPUNCH,GIGAIMPACT,GYROBALL,HEATWAVE,HEX,HYPERBEAM,IRONHEAD,LOWKICK,NIGHTSHADE,OVERHEAT,PLAYROUGH,POLTERGEIST,PROTECT,REST,REVERSAL,ROAR,ROCKSLIDE,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SOLARBEAM,SPITE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SWIFT,TAKEDOWN,THUNDERPUNCH,WILDCHARGE,WILLOWISP,ZENHEADBUTT
-Height = 1.6
-Weight = 69.8
-Category = Ghost Flame
-Pokedex = Said to purify lost, forsaken souls with its flames and guide them to the afterlife. I believe its form has been influenced by the energy of the sacred mountain towering at Hisui's center.
-Generation = 8
-#-------------------------------
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolution = PIKACHU,None
+Evolutions = PIKACHU,None,
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -693,7 +627,7 @@ Height = 1.8
 Category = Hexpert
 Pokedex = While chanting strange spells, this Pokémon combines its internal toxins with what it's eaten, creating strange potions.
 Generation = 8
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [UNOWN,1]
 FormName = B
@@ -789,22 +723,10 @@ Height = 10.5
 Weight = 740.0
 Generation = 6
 #-------------------------------
-[QWILFISH,1]
-FormName = Hisuian
-Types = DARK,POISON
-Moves = 1,POISONSTING,1,TACKLE,4,HARDEN,8,BITE,12,FELLSTINGER,16,MINIMIZE,20,SPIKES,24,BRINE,28,BARBBARRAGE,32,PINMISSILE,36,TOXICSPIKES,40,STOCKPILE,40,SPITUP,44,TOXIC,48,CRUNCH,52,ACUPRESSURE,56,DESTINYBOND
-TutorMoves = ACIDSPRAY,AGILITY,BLIZZARD,CRUNCH,CURSE,DARKPULSE,DOUBLEEDGE,ENDURE,FACADE,GIGAIMPACT,GUNKSHOT,GYROBALL,HAZE,HEX,HYDROPUMP,ICEBEAM,ICYWIND,LASHOUT,LIQUIDATION,MUDSHOT,PAINSPLIT,POISONJAB,POISONTAIL,PROTECT,RAINDANCE,REST,REVERSAL,SCALESHOT,SCARYFACE,SHADOWBALL,SLEEPTALK,SLUDGEBOMB,SPIKES,SPITE,SUBSTITUTE,SURF,SWIFT,SWORDSDANCE,TAKEDOWN,TAUNT,THROATCHOP,TOXIC,TOXICSPIKES,VENOSHOCK,WATERFALL,WATERPULSE
-EggMoves = ACIDSPRAY,AQUAJET,AQUATAIL,ASTONISH,BUBBLEBEAM,FLAIL,HAZE,SELFDESTRUCT,SUPERSONIC,WATERPULSE
-Color = Black
-Pokedex = It absorbs toxins from the food it eats. The distinct purple spikes on its body are evidence of its potent poison.
-Generation = 8
-Flags = EggInRegion_3,InheritFormWithEverStone
-Evolutions = OVERQWIL,HasMove,BARBBARRAGE
-#-------------------------------
 [SCIZOR,1]
 FormName = Mega Scizor
 MegaStone = SCIZORITE
-BaseStats = 70,150,140,75,65,100
+BaseStats = 70,150,140,65,100,75
 BaseExp = 210
 Abilities = TECHNICIAN
 HiddenAbilities = TECHNICIAN
@@ -825,19 +747,6 @@ Weight = 62.5
 Pokedex = A tremendous influx of energy builds it up, but when Mega Evolution ends, Heracross is bothered by terrible soreness in its muscles.
 Generation = 6
 #-------------------------------
-[SNEASEL,1]
-FormName = Hisuian
-Types = FIGHTING,POISON
-Moves = 1,SCRATCH,1,LEER,1,ROCKSMASH,6,TAUNT,12,QUICKATTACK,18,METALCLAW,24,POISONJAB,30,BRICKBREAK,36,HONECLAWS,42,SLASH,48,AGILITY,54,SCREECH,60,CLOSECOMBAT
-TutorMoves = ACIDSPRAY,AERIALACE,AGILITY,BRICKBREAK,BULKUP,CALMMIND,CLOSECOMBAT,COACHING,DIG,ENDURE,FACADE,FALSESWIPE,FLING,FOCUSBLAST,FOCUSPUNCH,GIGAIMPACT,GRASSKNOT,GUNKSHOT,LASHOUT,LOWKICK,LOWSWEEP,METALCLAW,NASTYPLOT,POISONJAB,POISONTAIL,PROTECT,RAINDANCE,REST,REVERSAL,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SPITE,SUBSTITUTE,SUNNYDAY,SWIFT,SWORDSDANCE,TAKEDOWN,TAUNT,THIEF,THROATCHOP,TOXIC,TOXICSPIKES,VACUUMWAVE,VENOSHOCK,XSCISSOR
-EggMoves = COUNTER,DOUBLEHIT,FAKEOUT,FEINT,NIGHTSLASH,QUICKGUARD,SWITCHEROO
-Weight = 27.0
-Color = Gray
-Pokedex = Its sturdy, curved claws are ideal for traversing precipitous cliffs. From the tips of these claws drips a venom that infiltrates the nerves of any prey caught in Sneasel's grasp.
-Generation = 8
-Flags = EggInRegion_3,InheritFormWithEverStone
-Evolutions = SNEASLER,DayHoldItem,RAZORCLAW
-#-------------------------------
 [CORSOLA,1]
 FormName = Galarian
 Types = GHOST
@@ -851,8 +760,8 @@ Weight = 0.5
 Color = White
 Pokedex = Sudden climate change wiped out this ancient kind of Corsola. This Pokémon absorbs others' life-force through its branches.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = CURSOLA,Level,38
+Flags = InheritFormWithEverStone
+Evolutions = CURSOLA,Level,38
 #-------------------------------
 [HOUNDOOM,1]
 FormName = Mega Houndoom
@@ -917,7 +826,7 @@ EggMoves = KNOCKOFF,PARTINGSHOT,QUICKGUARD
 Color = White
 Pokedex = Its restlessness has it constantly running around. If it sees another Pokémon, it will purposely run into them in order to start a fight.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [LINOONE,1]
 FormName = Galarian
@@ -926,8 +835,8 @@ Moves = 0,NIGHTSLASH,1,SWITCHEROO,1,PINMISSILE,1,BABYDOLLEYES,1,TACKLE,1,LEER,1,
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYPRESS,BODYSLAM,CAPTIVATE,CONFIDE,DIG,DOUBLEEDGE,DOUBLETEAM,ENDURE,FACADE,FAKETEARS,FLING,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MIMIC,MUDSHOT,NATURALGIFT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,RETURN,ROUND,SCARYFACE,SCREECH,SECRETPOWER,SEEDBOMB,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,SNORE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWIFT,TAUNT,THIEF,THROATCHOP,THUNDER,THUNDERBOLT,THUNDERWAVE,TRICK,WHIRLPOOL,WORKUP
 Pokedex = It uses its long tongue to taunt opponents. Once the opposition is enraged, this Pokémon hurls itself at the opponent, tackling them forcefully.
 Generation = 8
-Flags = InheritFormWithEverstone
-Evolution = OBSTAGOON,LevelNight,35
+Flags = InheritFormWithEverStone
+Evolutions = OBSTAGOON,LevelNight,35
 #-------------------------------
 [GARDEVOIR,1]
 FormName = Mega Gardevoir
@@ -1306,22 +1215,6 @@ BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This is Rotom after it's seized control of a lawn mower that has a special motor. As it mows down grass, it scatters the clippings everywhere.
 #-------------------------------
-[DIALGA,1]
-FormName = Origin Forme
-BaseStats = 100,100,120,90,150,120
-Color = Blue
-Height = 7.0
-Weight = 850.0
-Pokedex = Radiant light caused Dialga to take on a form bearing a striking resemblance to the creator Pokémon. Dialga now wields such colossal strength that one must conclude this is its true form.
-#-------------------------------
-[PALKIA,1]
-FormName = Origin Forme
-BaseStats = 90,100,100,120,150,120
-Shape = Quadruped
-Height = 6.3
-Weight = 660.0
-Pokedex = It soars across the sky in a form that greatly resembles the creator of all things. Perhaps this imitation of appearance is Palkia's strategy for gaining Arceus's powers.
-#-------------------------------
 [GIRATINA,1]
 FormName = Origin Forme
 BaseStats = 150,120,100,90,120,100
@@ -1416,17 +1309,6 @@ FormName = Fairy Type
 Types = FAIRY
 Generation = 6
 #-------------------------------
-[SAMUROTT,1]
-FormName = Hisuian
-Types = WATER,DARK
-BaseStats = 90,108,80,85,100,65
-EVs = ATTACK,3
-Moves = 0,CEASELESSEDGE,1,SUCKERPUNCH,1,SLASH,1,MEGAHORN,1,TACKLE,1,TAILWHIP,1,WATERGUN,13,FOCUSENERGY,18,RAZORSHELL,21,FURYCUTTER,25,WATERPULSE,29,AERIALACE,34,AQUAJET,39,ENCORE,46,AQUATAIL,51,RETALIATE,58,SWORDSDANCE,63,HYDROPUMP
-TutorMoves = AERIALACE,AIRSLASH,AVALANCHE,BLIZZARD,BODYSLAM,BRICKBREAK,BULLDOZE,DARKPULSE,DIG,DRILLRUN,ENCORE,ENDURE,FACADE,FALSESWIPE,FLING,FLIPTURN,GIGAIMPACT,GRASSKNOT,HELPINGHAND,HYDROCANNON,HYDROPUMP,HYPERBEAM,ICEBEAM,ICYWIND,KNOCKOFF,LASHOUT,LIQUIDATION,PROTECT,RAINDANCE,REST,SCARYFACE,SLEEPTALK,SMARTSTRIKE,SNARL,SUBSTITUTE,SURF,SWIFT,SWORDSDANCE,TAKEDOWN,TAUNT,THIEF,THROATCHOP,VACUUMWAVE,WATERFALL,WATERPLEDGE,WATERPULSE,WHIRLPOOL,XSCISSOR
-Weight = 58.2
-Pokedex = Hard of heart and deft of blade, this rare form of Samurott is a product of the Pokémon's evolution in the region of Hisui. Its turbulent blows crash into foes like ceaseless pounding waves.
-Generation = 8
-#-------------------------------
 [AUDINO,1]
 FormName = Mega Audino
 MegaStone = AUDINITE
@@ -1440,51 +1322,12 @@ Weight = 32.0
 Color = White
 Generation = 6
 #-------------------------------
-[LILLIGANT,1]
-FormName = Hisuian
-Types = GRASS,FIGHTING
-BaseStats = 70,105,75,105,50,75
-EVs = ATTACK,1,SPEED,1
-Abilities = CHLOROPHYLL,HUSTLE
-Moves = 0,VICTORYDANCE,1,PETALBLIZZARD,1,TEETERDANCE,1,DEFOG,1,LEAFBLADE,1,MEGAKICK,1,SOLARBLADE,1,MEGADRAIN,1,MAGICALLEAF,1,SLEEPPOWDER,1,GIGADRAIN,1,LEECHSEED,1,AFTERYOU,1,ENERGYBALL,1,SYNTHESIS,1,SUNNYDAY,1,ENTRAINMENT,1,LEAFSTORM,1,ABSORB,1,GROWTH,1,HELPINGHAND,1,STUNSPORE,5,CLOSECOMBAT
-TutorMoves = ACROBATICS,AERIALACE,AIRSLASH,BRICKBREAK,BULLETSEED,CHARM,CLOSECOMBAT,COACHING,ENCORE,ENDURE,ENERGYBALL,FACADE,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRASSYGLIDE,GRASSYTERRAIN,HELPINGHAND,HURRICANE,HYPERBEAM,LEAFSTORM,LOWKICK,LOWSWEEP,MAGICALLEAF,METRONOME,PETALBLIZZARD,POISONJAB,POLLENPUFF,PROTECT,PSYCHUP,RAINDANCE,REST,SEEDBOMB,SLEEPTALK,SOLARBEAM,SOLARBLADE,SUBSTITUTE,SUNNYDAY,SWORDSDANCE,TAKEDOWN,TRIPLEAXEL,VACUUMWAVE,WEATHERBALL
-Shape = Bipedal
-Height = 1.2
-Weight = 19.2
-Category = Spinning
-Pokedex = I suspect that its well-developed legs are the result of a life spent on mountains covered in deep snow. The scent it exudes from its flower crown heartens those in proximity.
-Generation = 8
-#-------------------------------
 [BASCULIN,1]
 FormName = Blue-Striped
 Abilities = ROCKHEAD,ADAPTABILITY
 Pokedex = Even Basculin, which devours everything it can with its huge jaws, is nothing more than food to organisms stronger than itself.
 WildItemUncommon = DEEPSEASCALE
 #-------------------------------
-[BASCULIN,2]
-FormName = White-Striped
-Abilities = RATTLED,ADAPTABILITY
-Moves = 1,WATERGUN,1,TAILWHIP,4,TACKLE,8,FLAIL,12,AQUAJET,16,BITE,20,SCARYFACE,24,HEADBUTT,28,SOAK,32,CRUNCH,36,TAKEDOWN,40,UPROAR,44,WAVECRASH,48,THRASH,52,DOUBLEEDGE,56,HEADSMASH
-TutorMoves = AGILITY,BLIZZARD,CRUNCH,DOUBLEEDGE,ENDEAVOR,ENDURE,FACADE,FLIPTURN,HYDROPUMP,ICEBEAM,ICEFANG,ICYWIND,LIQUIDATION,MUDDYWATER,MUDSHOT,PROTECT,PSYCHICFANGS,RAINDANCE,REST,SCALESHOT,SCARYFACE,SLEEPTALK,SUBSTITUTE,SURF,SWIFT,TAKEDOWN,UPROAR,WATERFALL,WATERPULSE,WHIRLPOOL,ZENHEADBUTT
-EggMoves = ENDEAVOR
-Category = Mellow
-Pokedex = They live in frigid seas, forming schools and sharing food among themselves. When the time comes, they return to the river they were born in.
-Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = BASCULEGION,Counter,294
-#-------------------------------
-[BASCULIN,3]
-PokedexForm = 2
-Abilities = RATTLED,ADAPTABILITY
-Moves = 1,WATERGUN,1,TAILWHIP,4,TACKLE,8,FLAIL,12,AQUAJET,16,BITE,20,SCARYFACE,24,HEADBUTT,28,SOAK,32,CRUNCH,36,TAKEDOWN,40,UPROAR,44,WAVECRASH,48,THRASH,52,DOUBLEEDGE,56,HEADSMASH
-TutorMoves = AGILITY,BLIZZARD,CRUNCH,DOUBLEEDGE,ENDEAVOR,ENDURE,FACADE,FLIPTURN,HYDROPUMP,ICEBEAM,ICEFANG,ICYWIND,LIQUIDATION,MUDDYWATER,MUDSHOT,PROTECT,PSYCHICFANGS,RAINDANCE,REST,SCALESHOT,SCARYFACE,SLEEPTALK,SUBSTITUTE,SURF,SWIFT,TAKEDOWN,UPROAR,WATERFALL,WATERPULSE,WHIRLPOOL,ZENHEADBUTT
-EggMoves = ENDEAVOR
-Category = Mellow
-Pokedex = They live in frigid seas, forming schools and sharing food among themselves. When the time comes, they return to the river they were born in.
-Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = BASCULEGION,Counter,294
-#-------------------------------
 [DARUMAKA,2]
 FormName = Galarian
 Types = ICE
@@ -1496,8 +1339,8 @@ Weight = 40.0
 Color = White
 Pokedex = The colder they get, the more energetic they are. They freeze their breath to make snowballs, using them as ammo for playful snowball fights.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = DARMANITAN,Item,ICESTONE
+Flags = InheritFormWithEverStone
+Evolutions = DARMANITAN,Item,ICESTONE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
@@ -1520,7 +1363,7 @@ Color = White
 Category = Zen Charm
 Pokedex = On days when blizzards blow through, it comes down to where people live. It stashes food in the snowball on its head, taking it home for later.
 Generation = 8
-Flags = InheritFormWithEverstone
+Flags = InheritFormWithEverStone
 #-------------------------------
 [DARMANITAN,3]
 FormName = Galarian Zen Mode
@@ -1547,33 +1390,8 @@ Moves = 1,ASTONISH,1,PROTECT,4,HAZE,8,NIGHTSHADE,12,DISABLE,16,BRUTALSWING,20,CR
 TutorMoves = ALLYSWITCH,ATTRACT,BRUTALSWING,CALMMIND,CAPTIVATE,CONFIDE,DARKPULSE,DOUBLEEDGE,DOUBLETEAM,EARTHPOWER,EARTHQUAKE,ENDURE,ENERGYBALL,FACADE,FAKETEARS,FRUSTRATION,HEX,HIDDENPOWER,IMPRISON,IRONDEFENSE,MIMIC,NASTYPLOT,NATURALGIFT,PAYBACK,POLTERGEIST,PROTECT,PSYCHIC,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,SUBSTITUTE,SWAGGER,THIEF,TOXIC,TOXICSPIKES,TRICK,TRICKROOM,WILLOWISP,WONDERROOM,ZENHEADBUTT
 Pokedex = A clay slab with cursed engravings took possession of a Yamask. The slab is said to be absorbing the Yamask's dark power.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-Evolution = RUNERIGUS,AfterBattleCounterMakeReady,49
-Evolution = RUNERIGUS,EventReady,2
-#-------------------------------
-[ZORUA,1]
-FormName = Hisuian
-Types = NORMAL,GHOST
-BaseStats = 35,60,40,70,85,40
-Moves = 1,SCRATCH,1,LEER,4,TORMENT,8,HONECLAWS,12,SHADOWSNEAK,16,CURSE,20,TAUNT,24,KNOCKOFF,28,SPITE,32,AGILITY,36,SHADOWBALL,40,BITTERMALICE,44,NASTYPLOT,48,FOULPLAY
-TutorMoves = AGILITY,BURNINGJEALOUSY,CALMMIND,CONFUSERAY,CURSE,DARKPULSE,DIG,ENDURE,FACADE,FAKETEARS,FLING,FOCUSPUNCH,FOULPLAY,GIGAIMPACT,HEX,HYPERBEAM,ICYWIND,IMPRISON,KNOCKOFF,LASHOUT,NASTYPLOT,NIGHTSHADE,PAINSPLIT,PHANTOMFORCE,PROTECT,PSYCHUP,RAINDANCE,REST,ROAR,SHADOWBALL,SHADOWCLAW,SKITTERSMACK,SLEEPTALK,SLUDGEBOMB,SNARL,SPITE,SUBSTITUTE,SWIFT,TAKEDOWN,TAUNT,THIEF,TRICK,UTURN,WILLOWISP
-EggMoves = DETECT,EXTRASENSORY,MEMENTO
-Category = Spiteful Fox
-Pokedex = A once-departed soul, returned to life in Hisui. Derives power from resentment, which rises as energy atop its head and takes on the forms of foes. In this way, Zorua vents lingering malice.
-Generation = 8
-Flags = EggInRegion_3,InheritFormWithEverStone
-#-------------------------------
-[ZOROARK,1]
-FormName = Hisuian
-Types = NORMAL,GHOST
-BaseStats = 55,100,60,110,125,60
-Moves = 0,SHADOWCLAW,1,UTURN,1,SCRATCH,1,LEER,1,TORMENT,1,HONECLAWS,12,SHADOWSNEAK,16,CURSE,20,TAUNT,24,KNOCKOFF,28,SPITE,34,AGILITY,40,SHADOWBALL,46,BITTERMALICE,52,NASTYPLOT,58,FOULPLAY
-TutorMoves = AERIALACE,AGILITY,BODYSLAM,BRICKBREAK,BURNINGJEALOUSY,CALMMIND,CONFUSERAY,CRUNCH,CURSE,DARKPULSE,DIG,ENDURE,FACADE,FAKETEARS,FLAMETHROWER,FLING,FOCUSBLAST,FOCUSPUNCH,FOULPLAY,GIGAIMPACT,GRASSKNOT,HELPINGHAND,HEX,HYPERBEAM,HYPERVOICE,ICYWIND,IMPRISON,KNOCKOFF,LASHOUT,LOWKICK,LOWSWEEP,NASTYPLOT,NIGHTSHADE,PAINSPLIT,PHANTOMFORCE,POLTERGEIST,PROTECT,PSYCHIC,PSYCHUP,RAINDANCE,REST,ROAR,SCARYFACE,SHADOWBALL,SHADOWCLAW,SKITTERSMACK,SLEEPTALK,SLUDGEBOMB,SNARL,SPITE,SUBSTITUTE,SWIFT,SWORDSDANCE,TAKEDOWN,TAUNT,THIEF,THROATCHOP,TRICK,UTURN,WILLOWISP
-Weight = 73.0
-Category = Baneful Fox
-Pokedex = With its disheveled white fur, it looks like an embodiment of death. Heedless of its own safety, Zoroark attacks its nemeses with a bitter energy so intense, it lacerates Zoroark's own body.
-Generation = 8
 Flags = InheritFormWithEverStone
+Evolutions = RUNERIGUS,EventAfterDamageTaken,2
 #-------------------------------
 [DEERLING,1]
 FormName = Summer Form
@@ -1609,22 +1427,7 @@ Weight = 20.5
 Color = Green
 Pokedex = Its conspicuous lips lure prey in as it lies in wait in the mud. When prey gets close, Stunfisk clamps its jagged steel fins down on them.
 Generation = 8
-Flags = EggInRegion_2,InheritFormWithEverstone
-#-------------------------------
-[BRAVIARY,1]
-FormName = Hisuian
-Types = PSYCHIC,FLYING
-BaseStats = 110,83,70,65,112,70
-EVs = SPECIAL_ATTACK,2
-HiddenAbilities = TINTEDLENS
-Moves = 0,ESPERWING,1,SUPERPOWER,1,SKYATTACK,1,PECK,1,LEER,1,HONECLAWS,1,WINGATTACK,18,TAILWIND,24,SCARYFACE,30,AERIALACE,36,SLASH,42,WHIRLWIND,48,CRUSHCLAW,57,AIRSLASH,64,DEFOG,72,THRASH,80,HURRICANE
-TutorMoves = ACROBATICS,AERIALACE,AGILITY,AIRCUTTER,AIRSLASH,BODYSLAM,BRAVEBIRD,BULKUP,CALMMIND,CLOSECOMBAT,CONFUSERAY,DAZZLINGGLEAM,DOUBLEEDGE,DUALWINGBEAT,ENDURE,EXPANDINGFORCE,FACADE,FEATHERDANCE,FLY,FUTURESIGHT,GIGAIMPACT,HEATWAVE,HELPINGHAND,HURRICANE,HYPERBEAM,HYPERVOICE,ICYWIND,METALCLAW,NIGHTSHADE,PROTECT,PSYBEAM,PSYCHIC,PSYCHICTERRAIN,PSYCHUP,PSYSHOCK,RAINDANCE,REST,REVERSAL,ROCKSLIDE,ROCKTOMB,SCARYFACE,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SWIFT,TAILWIND,TAKEDOWN,UTURN,VACUUMWAVE,ZENHEADBUTT
-Height = 1.7
-Weight = 43.4
-Color = White
-Category = Battle Cry
-Pokedex = Screaming a bloodcurdling battle cry, this huge and ferocious bird Pokémon goes out on the hunt. It blasts lakes with shock waves, then scoops up any prey that float to the water's surface.
-Generation = 8
+Flags = InheritFormWithEverStone
 #-------------------------------
 [TORNADUS,1]
 FormName = Therian Forme
@@ -1659,7 +1462,7 @@ BaseStats = 125,120,90,95,170,100
 BaseExp = 350
 EVs = SPECIAL_ATTACK,3
 Abilities = TURBOBLAZE
-Moves = 1,DRAGONBREATH,1,NOBLEROAR,1,ANCIENTPOWER,1,FREEZEDRY,8,SLASH,16,ENDEAVOR,24,DRAGONPULSE,32,ICEBEAM,40,HYPERVOICE,48,FUSIONFLARE,56,BLIZZARD,64,IMPRISON,72,OUTRAGE,80,ICEBURN,88,SHEERCOLD
+Moves = 1,ICYWIND,1,DRAGONRAGE,8,IMPRISON,15,ANCIENTPOWER,22,ICEBEAM,29,DRAGONBREATH,36,SLASH,43,FUSIONFLARE,50,ICEBURN,57,DRAGONPULSE,64,NOBLEROAR,71,ENDEAVOR,78,BLIZZARD,85,OUTRAGE,92,HYPERVOICE
 Height = 3.6
 Pokedex = It has foreseen that a world of truth will arrive for people and Pokémon. It strives to protect that future.
 #-------------------------------
@@ -1669,7 +1472,7 @@ BaseStats = 125,170,100,95,120,90
 BaseExp = 350
 EVs = ATTACK,3
 Abilities = TERAVOLT
-Moves = 1,DRAGONBREATH,1,NOBLEROAR,1,ANCIENTPOWER,1,FREEZEDRY,8,SLASH,16,ENDEAVOR,24,DRAGONPULSE,32,ICEBEAM,40,HYPERVOICE,48,FUSIONBOLT,56,BLIZZARD,64,IMPRISON,72,OUTRAGE,80,FREEZESHOCK,88,SHEERCOLD
+Moves = 1,ICYWIND,1,DRAGONRAGE,8,IMPRISON,15,ANCIENTPOWER,22,ICEBEAM,29,DRAGONBREATH,36,SLASH,43,FUSIONBOLT,50,FREEZESHOCK,57,DRAGONPULSE,64,NOBLEROAR,71,ENDEAVOR,78,BLIZZARD,85,OUTRAGE,92,HYPERVOICE
 Height = 3.3
 Pokedex = It's said that this Pokémon battles in order to protect the ideal world that will exist in the future for people and Pokémon.
 #-------------------------------
@@ -1814,7 +1617,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,1,FAIRYWIND,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolution = FLORGES,None
+Evolutions = FLORGES,None,
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
@@ -1858,8 +1661,7 @@ FormName = Pharaoh Trim
 [MEOWSTIC,1]
 FormName = Female
 HiddenAbilities = COMPETITIVE
-Moves = 1,MAGICALLEAF,1,SCRATCH,1,LEER,1,FAKEOUT,1,DISARMINGVOICE,9,CONFUSION,12,STOREDPOWER,15,CHARGEBEAM,18,COVET,21,PSYBEAM,24,SUCKERPUNCH,29,ROLEPLAY,34,LIGHTSCREEN,34,REFLECT,39,PSYSHOCK,44,EXTRASENSORY,49,SHADOWBALL,54,PSYCHIC,59,FUTURESIGHT
-TutorMoves = ALLYSWITCH,ATTRACT,CALMMIND,CAPTIVATE,CHARGEBEAM,CHARM,CONFIDE,COVET,CUT,DARKPULSE,DIG,DOUBLETEAM,DREAMEATER,ECHOEDVOICE,ENDURE,ENERGYBALL,EXPANDINGFORCE,FACADE,FAKETEARS,FLASH,FRUSTRATION,FUTURESIGHT,GIGAIMPACT,GRAVITY,HEALBELL,HELPINGHAND,HIDDENPOWER,HYPERBEAM,IRONTAIL,LIGHTSCREEN,MAGICALLEAF,MAGICCOAT,MAGICROOM,MIMIC,NASTYPLOT,NATURALGIFT,PAYBACK,PAYDAY,PLAYROUGH,POWERUPPUNCH,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYCHUP,PSYSHOCK,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROLEPLAY,ROUND,SAFEGUARD,SECRETPOWER,SHADOWBALL,SHOCKWAVE,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SNATCH,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SWAGGER,SWIFT,TAILSLAP,TELEKINESIS,THUNDERBOLT,THUNDERWAVE,TORMENT,TOXIC,TRICK,TRICKROOM,WONDERROOM,WORKUP,ZENHEADBUTT
+Moves = 1,STOREDPOWER,1,MEFIRST,1,MAGICALLEAF,1,SCRATCH,1,LEER,1,COVET,1,CONFUSION,5,COVET,9,CONFUSION,13,LIGHTSCREEN,17,PSYBEAM,19,FAKEOUT,22,DISARMINGVOICE,25,PSYSHOCK,28,CHARGEBEAM,31,SHADOWBALL,35,EXTRASENSORY,40,PSYCHIC,43,ROLEPLAY,45,SIGNALBEAM,48,SUCKERPUNCH,50,FUTURESIGHT,53,STOREDPOWER
 Color = White
 Pokedex = Females are a bit more selfish and aggressive than males. If they don't get what they want, they will torment you with their psychic abilities.
 #-------------------------------
@@ -1869,32 +1671,6 @@ BaseStats = 60,140,50,60,140,50
 EVs = ATTACK,2,SPECIAL_ATTACK,1
 Pokedex = Once upon a time, a king with an Aegislash reigned over the land. His Pokémon eventually drained him of life, and his kingdom fell with him.
 #-------------------------------
-[SLIGGOO,1]
-FormName = Hisuian
-Types = STEEL,DRAGON
-BaseStats = 58,75,83,40,83,113
-Abilities = SAPSIPPER,SHELLARMOR
-Moves = 0,SHELTER,1,ACIDARMOR,1,ABSORB,1,TACKLE,1,WATERGUN,1,DRAGONBREATH,15,PROTECT,20,FLAIL,25,WATERPULSE,30,RAINDANCE,35,DRAGONPULSE,43,CURSE,49,IRONHEAD,56,MUDDYWATER
-TutorMoves = ACIDSPRAY,BLIZZARD,BODYSLAM,CHARM,CURSE,DRACOMETEOR,DRAGONPULSE,ENDURE,FACADE,FLASHCANNON,GYROBALL,HEAVYSLAM,ICEBEAM,IRONHEAD,MUDDYWATER,MUDSHOT,OUTRAGE,PROTECT,RAINDANCE,REST,ROCKSLIDE,ROCKTOMB,SANDSTORM,SKITTERSMACK,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,STEELBEAM,SUBSTITUTE,SUNNYDAY,TAKEDOWN,THUNDER,THUNDERBOLT,WATERPULSE
-Height = 0.7
-Weight = 68.5
-Category = Snail
-Pokedex = A creature given to melancholy. I suspect its metallic shell developed as a result of the mucus on its skin reacting with the iron in Hisui's water.
-Generation = 8
-#-------------------------------
-[GOODRA,1]
-FormName = Hisuian
-Types = STEEL,DRAGON
-BaseStats = 80,100,100,60,110,150
-Abilities = SAPSIPPER,SHELLARMOR
-Moves = 0,IRONTAIL,1,SHELTER,1,ACIDSPRAY,1,TEARFULLOOK,1,FEINT,1,ABSORB,1,TACKLE,1,WATERGUN,1,DRAGONBREATH,15,PROTECT,20,FLAIL,25,WATERPULSE,30,RAINDANCE,35,DRAGONPULSE,43,CURSE,49,IRONHEAD,49,BODYSLAM,58,MUDDYWATER,67,HEAVYSLAM
-TutorMoves = ACIDSPRAY,BLIZZARD,BODYPRESS,BODYSLAM,BREAKINGSWIPE,BULLDOZE,CHARM,CURSE,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DRAGONTAIL,EARTHQUAKE,ENDURE,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLASHCANNON,GIGAIMPACT,GYROBALL,HEAVYSLAM,HYDROPUMP,HYPERBEAM,ICEBEAM,IRONHEAD,KNOCKOFF,LASHOUT,MUDDYWATER,MUDSHOT,OUTRAGE,PROTECT,RAINDANCE,REST,ROCKSLIDE,ROCKTOMB,SANDSTORM,SCARYFACE,SKITTERSMACK,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,STEELBEAM,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,TAKEDOWN,THUNDER,THUNDERBOLT,THUNDERPUNCH,WATERPULSE,WEATHERBALL
-Height = 1.7
-Weight = 334.1
-Category = Shell Bunker
-Pokedex = Able to freely control the hardness of its metallic shell. It loathes solitude and is extremely clingy—it will fume and run riot if those dearest to it ever leave its side.
-Generation = 8
-#-------------------------------
 [PUMPKABOO,1]
 FormName = Average Size
 BaseStats = 49,66,70,51,44,55
@@ -1947,18 +1723,6 @@ WildItemCommon = MIRACLESEED
 WildItemUncommon = MIRACLESEED
 WildItemRare = MIRACLESEED
 #-------------------------------
-[AVALUGG,1]
-FormName = Hisuian
-Types = ICE,ROCK
-BaseStats = 95,127,184,38,34,36
-Abilities = STRONGJAW,ICEBODY
-Moves = 0,ROCKSLIDE,1,WIDEGUARD,1,RAPIDSPIN,1,HARDEN,1,TACKLE,1,POWDERSNOW,9,CURSE,12,ICYWIND,15,PROTECT,18,AVALANCHE,21,BITE,24,ICEFANG,27,IRONDEFENSE,30,RECOVER,33,CRUNCH,36,TAKEDOWN,41,BLIZZARD,46,DOUBLEEDGE,51,STONEEDGE,61,MOUNTAINGALE
-TutorMoves = AVALANCHE,BLIZZARD,BODYPRESS,BODYSLAM,BULLDOZE,CRUNCH,CURSE,DIG,DOUBLEEDGE,EARTHQUAKE,ENDURE,FACADE,GIGAIMPACT,GYROBALL,HEAVYSLAM,HIGHHORSEPOWER,HYPERBEAM,ICEBEAM,ICEFANG,ICICLESPEAR,ICYWIND,IRONDEFENSE,IRONHEAD,METEORBEAM,PROTECT,RAINDANCE,REST,ROCKBLAST,ROCKSLIDE,ROCKTOMB,SANDSTORM,SCARYFACE,SLEEPTALK,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,TAKEDOWN
-Height = 1.4
-Weight = 262.4
-Pokedex = The armor of ice covering its lower jaw puts steel to shame and can shatter rocks with ease. This Pokémon barrels along steep mountain paths, cleaving through the deep snow.
-Generation = 8
-#-------------------------------
 [XERNEAS,1]
 FormName = Active Mode
 #-------------------------------
@@ -2017,17 +1781,6 @@ Height = 6.5
 Weight = 490.0
 Shape = BipedalTail
 #-------------------------------
-[DECIDUEYE,1]
-FormName = Hisuian
-Types = GRASS,FIGHTING
-BaseStats = 88,112,80,60,95,95
-HiddenAbilities = SCRAPPY
-Moves = 0,TRIPLEARROWS,1,LEAFSTORM,1,UTURN,1,TACKLE,1,GROWL,1,LEAFAGE,9,PECK,12,SHADOWSNEAK,15,RAZORLEAF,20,SYNTHESIS,25,PLUCK,30,BULKUP,37,SUCKERPUNCH,44,LEAFBLADE,51,FEATHERDANCE,58,BRAVEBIRD
-TutorMoves = AERIALACE,AIRCUTTER,AIRSLASH,AURASPHERE,BATONPASS,BRAVEBIRD,BRICKBREAK,BULKUP,BULLETSEED,CLOSECOMBAT,COACHING,CONFUSERAY,DUALWINGBEAT,ENDURE,ENERGYBALL,FACADE,FALSESWIPE,FEATHERDANCE,FOCUSBLAST,FOCUSPUNCH,FRENZYPLANT,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRASSPLEDGE,GRASSYGLIDE,GRASSYTERRAIN,HAZE,HELPINGHAND,HYPERBEAM,KNOCKOFF,LEAFSTORM,LIGHTSCREEN,LOWKICK,LOWSWEEP,MAGICALLEAF,NASTYPLOT,NIGHTSHADE,PROTECT,RAINDANCE,REST,REVERSAL,ROCKTOMB,SCARYFACE,SEEDBOMB,SHADOWCLAW,SLEEPTALK,SMACKDOWN,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SWIFT,SWORDSDANCE,TAILWIND,TAKEDOWN,TAUNT,UTURN
-Weight = 37.0
-Pokedex = The air stored inside the rachises of Decidueye's feathers insulates the Pokémon against Hisui's extreme cold. This is firm proof that evolution can be influenced by environment.
-Generation = 8
-#-------------------------------
 [ORICORIO,1]
 FormName = Pom-Pom Style
 Types = ELECTRIC,FLYING
@@ -2050,15 +1803,15 @@ Pokedex = It summons the dead with its dreamy dancing. From their malice, it dra
 Abilities = OWNTEMPO
 HiddenAbilities = OWNTEMPO
 Flags = InheritFormFromMother
-Evolution = LYCANROC,LevelEvening,25
+Evolutions = LYCANROC,LevelEvening,25
 #-------------------------------
 [LYCANROC,1]
 FormName = Midnight Form
 BaseStats = 85,115,75,82,55,75
 Abilities = KEENEYE,VITALSPIRIT
 HiddenAbilities = NOGUARD
-Moves = 0,COUNTER,1,ENDURE,1,REVERSAL,1,TAUNT,1,TACKLE,1,LEER,1,SANDATTACK,1,DOUBLETEAM,12,ROCKTHROW,16,HOWL,20,BITE,24,ROCKTOMB,30,ROAR,36,ROCKSLIDE,42,CRUNCH,48,SCARYFACE,54,STEALTHROCK,60,STONEEDGE
-TutorMoves = ATTRACT,BRICKBREAK,BULKUP,CAPTIVATE,CLOSECOMBAT,CONFIDE,COVET,CRUNCH,DOUBLETEAM,EARTHPOWER,ECHOEDVOICE,ENDEAVOR,ENDURE,FACADE,FIREFANG,FIREPUNCH,FOULPLAY,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,HYPERVOICE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASHOUT,LASTRESORT,LOWSWEEP,MEGAKICK,MEGAPUNCH,MIMIC,NATURALGIFT,OUTRAGE,PAYBACK,PLAYROUGH,PROTECT,PSYCHICFANGS,REST,RETURN,REVENGE,REVERSAL,ROAR,ROCKBLAST,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SANDSTORM,SCARYFACE,SECRETPOWER,SLEEPTALK,SNARL,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,SWORDSDANCE,TAUNT,THROATCHOP,THUNDERFANG,THUNDERPUNCH,TOXIC,UPROAR,ZENHEADBUTT
+Moves = 0,COUNTER,1,REVERSAL,1,TAUNT,1,TACKLE,1,LEER,1,SANDATTACK,1,BITE,4,SANDATTACK,7,BITE,12,HOWL,15,ROCKTHROW,18,ODORSLEUTH,23,ROCKTOMB,26,ROAR,29,STEALTHROCK,34,ROCKSLIDE,37,SCARYFACE,40,CRUNCH,45,ROCKCLIMB,48,STONEEDGE
+TutorMoves = ATTRACT,BRICKBREAK,BULKUP,CAPTIVATE,CLOSECOMBAT,CONFIDE,COVET,CRUNCH,DOUBLEEDGE,DOUBLETEAM,DUALCHOP,EARTHPOWER,ECHOEDVOICE,ENDEAVOR,ENDURE,FACADE,FIREFANG,FIREPUNCH,FOCUSPUNCH,FOULPLAY,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,HYPERVOICE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASERFOCUS,LASHOUT,LASTRESORT,LOWSWEEP,MEGAKICK,MEGAPUNCH,MIMIC,NATURALGIFT,OUTRAGE,PAYBACK,PLAYROUGH,PROTECT,PSYCHICFANGS,REST,RETURN,REVENGE,REVERSAL,ROAR,ROCKBLAST,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SANDSTORM,SCARYFACE,SECRETPOWER,SLEEPTALK,SNARL,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,SWORDSDANCE,TAUNT,THROATCHOP,THUNDERFANG,THUNDERPUNCH,TOXIC,UPROAR,ZENHEADBUTT
 Height = 1.1
 Color = Red
 Shape = BipedalTail
@@ -2069,8 +1822,8 @@ FormName = Dusk Form
 BaseStats = 75,117,65,110,55,65
 Abilities = TOUGHCLAWS
 HiddenAbilities = TOUGHCLAWS
-Moves = 0,CRUSHCLAW,1,SUCKERPUNCH,1,ACCELEROCK,1,QUICKGUARD,1,QUICKATTACK,1,COUNTER,1,ENDURE,1,REVERSAL,1,TAUNT,1,TACKLE,1,LEER,1,SANDATTACK,1,DOUBLETEAM,12,ROCKTHROW,16,HOWL,20,BITE,24,ROCKTOMB,30,ROAR,36,ROCKSLIDE,42,CRUNCH,48,SCARYFACE,54,STEALTHROCK,60,STONEEDGE
-TutorMoves = ATTRACT,BRICKBREAK,BULKUP,CAPTIVATE,CLOSECOMBAT,CONFIDE,COVET,CRUNCH,DOUBLETEAM,DRILLRUN,EARTHPOWER,ECHOEDVOICE,ENDEAVOR,ENDURE,FACADE,FIREFANG,FOCUSENERGY,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,HYPERVOICE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASTRESORT,MIMIC,NATURALGIFT,OUTRAGE,PLAYROUGH,PROTECT,PSYCHICFANGS,REST,RETURN,REVERSAL,ROAR,ROCKBLAST,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SANDSTORM,SCARYFACE,SECRETPOWER,SLEEPTALK,SNARL,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,SWORDSDANCE,TAILSLAP,TAUNT,THUNDERFANG,TOXIC,WORKUP,ZENHEADBUTT
+Moves = 0,THRASH,1,ACCELEROCK,1,COUNTER,1,TACKLE,1,LEER,1,SANDATTACK,1,BITE,4,SANDATTACK,7,BITE,12,HOWL,15,ROCKTHROW,18,ODORSLEUTH,23,ROCKTOMB,26,ROAR,29,STEALTHROCK,34,ROCKSLIDE,37,SCARYFACE,40,CRUNCH,45,ROCKCLIMB,48,STONEEDGE
+TutorMoves = ATTRACT,BRICKBREAK,BULKUP,CAPTIVATE,CLOSECOMBAT,CONFIDE,COVET,CRUNCH,DOUBLEEDGE,DOUBLETEAM,DRILLRUN,EARTHPOWER,ECHOEDVOICE,ENDEAVOR,ENDURE,FACADE,FIREFANG,FOCUSENERGY,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,HYPERVOICE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASTRESORT,MIMIC,NATURALGIFT,OUTRAGE,PLAYROUGH,PROTECT,PSYCHICFANGS,REST,RETURN,REVERSAL,ROAR,ROCKBLAST,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SANDSTORM,SCARYFACE,SECRETPOWER,SLEEPTALK,SNARL,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,SWORDSDANCE,TAILSLAP,TAUNT,THUNDERFANG,TOXIC,WORKUP,ZENHEADBUTT
 Pokedex = Bathed in the setting sun of evening, Lycanroc has undergone a special kind of evolution. An intense fighting spirit underlies its calmness.
 Flags = InheritFormFromMother
 #-------------------------------
@@ -2296,7 +2049,7 @@ Pokedex = Capable of generating 15,000 volts of electricity, this Pokémon looks
 [SINISTEA,1]
 FormName = Antique Form
 Pokedex = The swirl pattern in this Pokémon's body is its weakness. If it gets stirred, the swirl loses its shape, and Sinistea gets dizzy.
-Evolution = POLTEAGEIST,Item,CHIPPEDPOT
+Evolutions = POLTEAGEIST,Item,CHIPPEDPOT
 #-------------------------------
 [POLTEAGEIST,1]
 FormName = Antique Form
@@ -2558,17 +2311,3 @@ Color = Black
 Shape = Quadruped
 Category = High King
 Pokedex = Legend says that by using its power to see all events from past to future, this Pokémon saved the creatures of a forest from a meteorite strike.
-#-------------------------------
-[BASCULEGION,3]
-FormName = Female
-BaseStats = 120,92,65,78,100,75
-Pokedex = It can afflict a target with terrifying illusions that are under its control. The deeper the sadness in its friends' souls, the paler Basculegion becomes.
-Generation = 8
-Flags = DefaultForm_3,InheritFormWithEverStone
-#-------------------------------
-[ENAMORUS,1]
-FormName = Therian Form
-BaseStats = 74,115,110,46,135,100
-Abilities = OVERCOAT
-Shape = Quadruped
-Pokedex = A different guise from its feminine humanoid form. From the clouds, it descends upon those who treat any form of life with disrespect and metes out wrathful, ruthless punishment.
--- a/PBS/abilities.txt
+++ b/PBS/abilities.txt
@@ -1070,175 +1070,3 @@ Description = Combines Unnerve and Chilling Neigh Abilities.
 [ASONEGRIMNEIGH]
 Name = As One
 Description = Combines Unnerve and Grim Neigh Abilities.
-#-------------------------------
-[LINGERINGAROMA]
-Name = Lingering Aroma
-Description = Contact with this Pokémon spreads this Ability.
-#-------------------------------
-[SEEDSOWER]
-Name = Seed Sower
-Description = When the Pokémon is hit, creates Grassy Terrain.
-#-------------------------------
-[THERMALEXCHANGE]
-Name = Thermal Exchange
-Description = Raises Attack when hit by a Fire move. Can't be burned.
-#-------------------------------
-[ANGERSHELL]
-Name = Anger Shell
-Description = Lowers defences and ups offences/Speed at half HP.
-#-------------------------------
-[PURIFYINGSALT]
-Name = Purifying Salt
-Description = Immune to status problems and resists Ghost damage.
-#-------------------------------
-[WELLBAKEDBODY]
-Name = Well-Baked Body
-Description = Sharply boosts Defense when hit by Fire moves.
-#-------------------------------
-[WINDRIDER]
-Name = Wind Rider
-Description = Boosts Attack if hit or affected by a wind move.
-#-------------------------------
-[GUARDDOG]
-Name = Guard Dog
-Description = Can't be forced to switch out. Intimidate ups Attack.
-#-------------------------------
-[ROCKYPAYLOAD]
-Name = Rocky Payload
-Description = Powers up Rock-type moves.
-#-------------------------------
-[WINDPOWER]
-Name = Wind Power
-Description = Powers up an Electric move if hit by a wind move.
-#-------------------------------
-[ZEROTOHERO]
-Name = Zero to Hero
-Description = Transforms into its Hero Form when it switches out.
-#-------------------------------
-[COMMANDER]
-Name = Commander
-Description = On entering battle, enters an ally Dodonzo's mouth.
-#-------------------------------
-[ELECTROMORPHOSIS]
-Name = Electromorphosis
-Description = Powers up the next Electric move when it is hit.
-#-------------------------------
-[PROTOSYNTHESIS]
-Name = Protosynthesis
-Description = Boosts the highest stat in sun or with Booster Energy.
-#-------------------------------
-[QUARKDRIVE]
-Name = Quark Drive
-Description = Boosts the highest stat on Electric Terrain.
-#-------------------------------
-[GOODASGOLD]
-Name = Good as Gold
-Description = Full immunity to other Pokémon's status moves.
-#-------------------------------
-[VESSELOFRUIN]
-Name = Vessel of Ruin
-Description = Lowers the Sp. Atk of all Pokémon except itself.
-#-------------------------------
-[SWORDOFRUIN]
-Name = Sword of Ruin
-Description = Lowers the Defense of all Pokémon except itself.
-#-------------------------------
-[TABLETSOFRUIN]
-Name = Tablets of Ruin
-Description = Lowers the Attack of all Pokémon except itself.
-#-------------------------------
-[BEADSOFRUIN]
-Name = Beads of Ruin
-Description = Lowers the Sp. Def of all Pokémon except itself.
-#-------------------------------
-[ORICHALCUMPULSE]
-Name = Orichalcum Pulse
-Description = Causes harsh sunlight and boosts Attack in sunlight.
-#-------------------------------
-[HADRONENGINE]
-Name = Hadron Engine
-Description = Creates Electric Terrain and ups Sp. Atk stat on it.
-#-------------------------------
-[OPPORTUNIST]
-Name = Opportunist
-Description = Copies boosts when an opponent's stat raises.
-#-------------------------------
-[CUDCHEW]
-Name = Cud Chew
-Description = After consuming a Berry, eats it again next turn.
-#-------------------------------
-[SHARPNESS]
-Name = Sharpness
-Description = Powers up slicing moves.
-#-------------------------------
-[SUPREMEOVERLORD]
-Name = Supreme Overlord
-Description = Raises Attack and Sp. Atk for each defeated ally.
-#-------------------------------
-[COSTAR]
-Name = Costar
-Description = On entering battle, copies an ally's stat changes.
-#-------------------------------
-[TOXICDEBRIS]
-Name = Toxic Debris
-Description = Scatters poison spikes when hit by physical moves.
-#-------------------------------
-[ARMORTAIL]
-Name = Armor Tail
-Description = Prevents opponents from using priority moves.
-#-------------------------------
-[EARTHEATER]
-Name = Earth Eater
-Description = Restores HP when hit by a Ground-type move.
-#-------------------------------
-[MYCELIUMMIGHT]
-Name = Mycelium Might
-Description = Status moves ignore foe Abilities by acting slowly.
-#-------------------------------
-[HOSPITALITY]
-Name = Hospitality
-Description = On entering battle, the ally restores a little HP.
-#-------------------------------
-[MINDSEYE]
-Name = Mind's Eye
-Description = Ignores Ghost immunities. Cannot lose accuracy.
-#-------------------------------
-[EMBODYASPECTSPEED]
-Name = Embody Aspect
-Description = The Pokémon's shining mask boosts its Speed stat.
-#-------------------------------
-[EMBODYASPECTATTACK]
-Name = Embody Aspect
-Description = The Pokémon's shining mask boosts its Attack stat.
-#-------------------------------
-[EMBODYASPECTSPDEF]
-Name = Embody Aspect
-Description = The Pokémon's shining mask boosts its Sp. Def stat.
-#-------------------------------
-[EMBODYASPECTDEFENSE]
-Name = Embody Aspect
-Description = The Pokémon's shining mask boosts its Defense stat.
-#-------------------------------
-[TOXICCHAIN]
-Name = Toxic Chain
-Description = The Pokémon may badly poison any target it hits.
-#-------------------------------
-[SUPERSWEETSYRUP]
-Name = Supersweet Syrup
-Description = On entering battle, lowers the foes' evasiveness.
-#-------------------------------
-[TERASHIFT]
-Name = Tera Shift
-Description = Transforms into its Terastal Form in battle.
-#-------------------------------
-[TERASHELL]
-Name = Tera Shell
-Description = At full HP, damage taken is not very effective.
-#-------------------------------
-[TERAFORMZERO]
-Name = Teraform Zero
-Description = Eliminates all effects of weather and terrain.
-#-------------------------------
-[POISONPUPPETEER]
-Name = Poison Puppeteer
-Description = Poisoning another Pokémon also causes confusion.
--- a/PBS/encounters.txt
+++ b/PBS/encounters.txt
@@ -1,311 +1 @@
-# See the documentation on the wiki to learn how to edit this file.
-#-------------------------------
-[002] # Lappet Town
-Water,2
-    60,TENTACOOL,14,19
-    30,MANTYKE,15,16
-    10,REMORAID,14,16
-OldRod
-    100,MAGIKARP,16,19
-GoodRod
-    60,BARBOACH,17,18
-    20,KRABBY,15,16
-    20,SHELLDER,16,19
-SuperRod
-    40,CHINCHOU,17,19
-    40,QWILFISH,16,19
-    15,CORSOLA,15,18
-    5,STARYU,15,17
-#-------------------------------
-[005] # Route 1
-Land,21
-    40,PIDGEY,11,14
-    40,RATTATA,11,14
-    9,PIDGEY,11,13
-    9,RATTATA,11,13
-    1,PIDGEY,14
-    1,RATTATA,14
-LandNight,21
-    39,RATTATA,10,14
-    30,HOOTHOOT,10,13
-    20,SPINARAK,8,12
-    9,HOOTHOOT,10,14
-    1,HOOTHOOT,14
-    1,RATTATA,15
-PokeRadar,20
-    100,STARLY,12,15
-#-------------------------------
-[005,1] # Route 1
-Land,21
-    40,PIDGEY,15,18
-    40,RATTATA,14,18
-    10,SENTRET,13,17
-    5,PIDGEY,14,16
-    5,RATTATA,13,16
-LandNight,21
-    40,RATTATA,14,18
-    30,HOOTHOOT,14,17
-    20,SPINARAK,12,16
-    10,CLEFAIRY,11,15
-#-------------------------------
-[021] # Route 2
-Land,21
-    50,RATTATA,12,15
-    30,POOCHYENA,11,15
-    10,SHINX,10,12
-    10,SHINX,10,11
-Water,2
-    60,MAGIKARP,7,10
-    30,GOLDEEN,11,14
-    10,STARYU,12,15
-OldRod
-    70,MAGIKARP,7,10
-    30,MAGIKARP,9,15
-GoodRod
-    60,GOLDEEN,12,14
-    20,FINNEON,12,15
-    20,MAGIKARP,12,17
-SuperRod
-    40,FINNEON,12,15
-    40,GOLDEEN,12,14
-    15,STARYU,12,15
-    5,STARYU,14,17
-HeadbuttLow
-    50,PINECO,11,13
-    30,LEDYBA,6,8
-    19,SPINARAK,9,12
-    1,MUNCHLAX,11,14
-HeadbuttHigh
-    50,PINECO,11,13
-    30,WURMPLE,6,8
-    20,SPINARAK,9,12
-PokeRadar,10
-    100,STANTLER,14
-#-------------------------------
-[028] # Natural Park
-Land,21
-    20,CATERPIE,10
-    20,SUNKERN,12
-    20,WEEDLE,10
-    15,PIDGEY,10,14
-    15,PIDGEY,12,14
-    5,KAKUNA,10
-    5,METAPOD,10
-LandNight,21
-    30,HOOTHOOT,10,14
-    30,SPINARAK,10,15
-    20,PINECO,9,13
-    10,DROWZEE,9,15
-    10,NATU,12,14
-LandMorning,21
-    25,CATERPIE,10,12
-    25,WEEDLE,10,12
-    20,PIDGEY,10,14
-    15,KAKUNA,10
-    15,METAPOD,10
-BugContest,21
-    20,CATERPIE,7,18
-    20,WEEDLE,7,18
-    10,KAKUNA,9,18
-    10,METAPOD,9,18
-    10,PARAS,10,17
-    10,VENONAT,10,16
-    5,BEEDRILL,12,15
-    5,BUTTERFREE,12,15
-    5,PINSIR,13,14
-    5,SCYTHER,13,14
-PokeRadar,40
-    50,BUTTERFREE,15,18
-    50,BEEDRILL,15,18
-#-------------------------------
-[031] # Route 3
-Land,21
-    30,NIDORANfE,12,15
-    30,NIDORANmA,12,15
-    20,PIKACHU,14,17
-    10,EEVEE,15
-    10,PONYTA,13,15
-Water,2
-    60,SURSKIT,13,14
-    35,LOTAD,14
-    5,LOTAD,15
-OldRod
-    70,MAGIKARP,6,11
-    30,MAGIKARP,10,17
-GoodRod
-    60,POLIWAG,12,15
-    20,PSYDUCK,11,14
-    20,WOOPER,13,17
-SuperRod
-    40,CHINCHOU,11,12
-    40,REMORAID,12,14
-    20,LUVDISC,10,16
-RockSmash,50
-    60,NOSEPASS,13,14
-    40,GEODUDE,12,15
-HeadbuttLow
-    30,PINECO,14,17
-    25,COMBEE,15,17
-    20,PINECO,14,16
-    10,HERACROSS,16,18
-    9,HERACROSS,16,17
-    5,COMBEE,15,16
-    1,MUNCHLAX,13,18
-HeadbuttHigh
-    50,SEEDOT,14,17
-    30,SHROOMISH,14,17
-    20,BURMY,12,15
-#-------------------------------
-[034] # Ice Cave
-Cave,5
-    40,SWINUB,16,18
-    20,SNEASEL,14,16
-    20,SNORUNT,12,15
-    10,SMOOCHUM,11,14
-    10,SNOVER,14
-#-------------------------------
-[039] # Route 4
-Land,21
-    50,SHELLOS_1,12,15
-    40,GRIMER,13,15
-    10,MURKROW,12,14
-#-------------------------------
-[041] # Route 5
-Land,21
-    50,GRIMER,13,15
-    40,SPEAROW,13,16
-    10,SLUGMA,13,14
-#-------------------------------
-[044] # Route 6
-Land,21
-    50,SHELLOS_1,12,15
-    40,GRIMER,13,15
-    10,MURKROW,12,14
-#-------------------------------
-[047] # Route 7
-Land,21
-    50,SHELLOS,12,15
-    30,BIDOOF,14,17
-    10,MURKROW,12,14
-    10,WURMPLE,9,12
-RockSmash,50
-    90,NOSEPASS,13,14
-    10,GEODUDE,12,15
-#-------------------------------
-[049] # Rock Cave 1F
-Cave,5
-    20,MAGNETON,14,16
-    20,MAGNETON,14,17
-    20,NOSEPASS,14,15
-    20,NOSEPASS,13,14
-    10,GEODUDE,13,15
-    10,MAWILE,14,16
-#-------------------------------
-[050] # Rock Cave B1F
-Cave,5
-    20,MAGNETON,14,16
-    20,MAGNETON,14,17
-    20,NOSEPASS,14,15
-    20,NOSEPASS,13,14
-    10,BURMY,14,16
-    10,GEODUDE,13,15
-#-------------------------------
-[051] # Dungeon
-Cave,5
-    20,CHINGLING,1
-    20,CLEFFA,1
-    20,IGGLYBUFF,1
-    20,PICHU,1
-    10,RIOLU,1
-    10,TYROGUE,1
-#-------------------------------
-[066] # Safari Zone outside
-Land,21
-    20,ABRA,12,15
-    20,DODUO,13,15
-    20,NIDORANfE,15,16
-    20,NIDORANmA,15,16
-    10,HOPPIP,13,17
-    10,TANGELA,14,16
-#-------------------------------
-[068] # Safari Zone
-Land,21
-    20,EXEGGCUTE,15,18
-    20,RHYHORN,16,18
-    10,AIPOM,14,17
-    10,GIRAFARIG,16,17
-    10,VENONAT,15,17
-    10,VENONAT,15,18
-    5,HERACROSS,15,17
-    5,TAUROS,15,16
-    4,PINSIR,16
-    4,SCYTHER,16
-    1,CHANSEY,17
-    1,KANGASKHAN,19
-Water,2
-    60,PSYDUCK,16,18
-    30,MARILL,15,18
-    5,BUIZEL,15,17
-    5,SLOWPOKE,14,16
-OldRod
-    70,MAGIKARP,17,21
-    30,MAGIKARP,17,20
-GoodRod
-    60,MAGIKARP,16,20
-    20,FEEBAS,16,20
-    20,POLIWAG,17,18
-SuperRod
-    40,GOLDEEN,16,18
-    40,REMORAID,17,19
-    15,CARVANHA,16,17
-    4,FINNEON,15,18
-    1,DRATINI,17
-#-------------------------------
-[069] # Route 8
-Land,21
-    20,MAREEP,16,18
-    20,ODDISH,15,17
-    13,BONSLY,14,16
-    10,DITTO,15,17
-    10,DITTO,16,18
-    10,LOTAD,15,18
-    10,LOTAD,15,17
-    5,BONSLY,14,17
-    1,BONSLY,15,16
-    1,BONSLY,15
-Water,2
-    60,TENTACOOL,14,19
-    30,MANTYKE,15,16
-    10,REMORAID,14,16
-OldRod
-    100,MAGIKARP,16,19
-GoodRod
-    60,BARBOACH,17,18
-    20,KRABBY,15,16
-    20,SHELLDER,16,19
-SuperRod
-    40,CHINCHOU,17,19
-    40,QWILFISH,16,19
-    15,CORSOLA,15,18
-    5,STARYU,15,17
-#-------------------------------
-[070] # Route 8 underwater
-Land,21
-    20,CHINCHOU,17,21
-    20,CLAMPERL,18,20
-    20,SHELLDER,18,20
-    10,CLAMPERL,18,19
-    10,CORSOLA,17,20
-    10,RELICANTH,16,19
-    10,SHELLDER,18,19
-#-------------------------------
-[075] # Tiall Region
-Land,21
-    20,GEODUDE_1,11,14
-    20,RATTATA_1,11,14
-    10,CUBONE,11,14
-    10,DIGLETT_1,11,14
-    10,MEOWTH_1,11,14
-    10,PIKACHU,11,14
-    10,SANDSHREW_1,11,14
-    10,VULPIX_1,11,14
+
--- a/PBS/items.txt
+++ b/PBS/items.txt
--- a/PBS/map_connections.txt
+++ b/PBS/map_connections.txt
@@ -1,40 +1,12 @@
-# See the documentation on the wiki to learn how to edit this file.
-#-------------------------------
-# Route 5 (41) - Route 4 Cycling Road (40)
-41,N,0,40,S,0
-# Route 5 (41) - Route 6 Cycling Road (45)
-41,S,6,45,N,0
-# Route 6 (44) - Route 1 (5)
-44,S,43,5,N,0
-# Safari Zone outside (66) - Route 1 (5)
-66,N,18,5,S,0
-# Cedolan City (7) - Route 1 (5)
-7,S,0,5,N,2
-# Lappet Town (2) - Route 1 (5)
-2,N,0,5,S,4
-# Cedolan City (7) - Route 6 (44)
-7,W,5,44,E,0
-# Lappet Town (2) - Safari Zone outside (66)
-2,W,0,66,E,0
-# Route 8 (69) - Safari Zone outside (66)
-69,N,0,66,S,10
-# Ingido Plateau outside (35) - Route 4 (39)
-35,W,11,39,E,0
-# Cedolan City (7) - Lerucean Town (23)
-7,E,0,23,W,78
-# Route 3 (31) - Lerucean Town (23)
-31,S,32,23,N,0
-# Route 2 (21) - Lerucean Town (23)
-21,E,0,23,W,1
-# Route 7 (47) - Cedolan City (7)
-47,W,0,7,E,0
-# Route 2 (21) - Cedolan City (7)
-21,S,0,7,N,21
-# Route 3 (31) - Ingido Plateau outside (35)
-31,W,0,35,E,10
-# Route 8 (69) - Lappet Town (2)
-69,N,12,2,S,0
-# Route 7 (47) - Battle Frontier (52)
-47,E,8,52,W,0
-# Route 2 (21) - Route 7 (47)
-21,E,77,47,W,0
+# Route 102 (10) - Petalburg Town (7)
+10,West,0,7,East,18
+# Route 104 (South) (12) - Petalburg Town (7)
+12,East,16,7,West,0
+# Oldale Town (8) - Route 102 (10)
+8,West,2,10,East,0
+# Route 101 (5) - Oldale Town (8)
+5,North,2,8,South,0
+# Route 103 (West) (11) - Oldale Town (8)
+11,South,3,8,North,0
+# Littleroot Town (9) - Route 101 (5)
+9,North,0,5,South,0
--- a/PBS/moves.txt
+++ b/PBS/moves.txt
--- a/PBS/pokemon.txt
+++ b/PBS/pokemon.txt
--- a/PBS/pokemon_forms.txt
+++ b/PBS/pokemon_forms.txt
--- a/PBS/town_map.txt
+++ b/PBS/town_map.txt
@@ -3,77 +3,34 @@
 [0]
 Name = Essen
 Filename = mapRegion0.png
-PointSize = 16,16
-Size = 30,20
-Point = 13,12,Lappet Town
-    Image = image_lappet_town
-    Description = \PN's house\nProfessor Oak's lab
-    FlySpot = 2,8,8
+Point = 13,12,Lappet Town,Oak's Lab,2,8,8
 Point = 13,11,Route 1
-    Description = Kurt's house
-Point = 13,10,Cedolan City
-    Image = image_cedolan_city
-    Description = Cedolan Dept. Store\nCedolan Gym\nMove Maniac House
-    FlySpot = 7,47,11
-    FlyIconOffset = 8,0
-Point = 14,10,Cedolan City
-    Image = image_cedolan_city
-    Description = Game Corner\nPokémon Institute
-    FlySpot = 7,47,11
-    HideFlyIcon = true
+Point = 13,10,Cedolan City,Cedolan Dept. Store,7,47,11
+Point = 14,10,Cedolan City,,7,47,11
 Point = 14,9,Route 2
-    Description = Bridges
 Point = 14,8,Route 2
-    Description = Bridges
-Point = 15,8,Lerucean Town
-    Image = image_lerucean_town
-    Description = Day Care Center\nPokémon Fan Club\nLerucean Market
-    FlySpot = 23,11,15
+Point = 15,8,Lerucean Town,,23,11,15
 Point = 16,8,Natural Park
-    Description = A Bug Catching Contest is held here every Tuesday, Thursday and Saturday.
 Point = 15,7,Route 3
-Point = 15,6,Route 3
-    Description = Ice Cave
+Point = 15,6,Route 3,Ice Cave
 Point = 14,6,Route 3
-    Description = Examples of trainer battles.
-Point = 13,6,Ingido Plateau
-    Image = image_ingido_plateau
-    Description = Pokémon League
-    FlySpot = 35,17,7
+Point = 13,6,Ingido Plateau,,35,17,7
 Point = 12,6,Route 4
 Point = 11,6,Route 4
-    Description = Cycle Road
-Point = 11,7,Route 5
-    Description = Cycle Road
-Point = 11,8,Route 5
-    Description = Cycle Road
-Point = 11,9,Route 5
-    Description = Cycle Road
+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
-    Description = Cycle Road
 Point = 12,10,Route 6
 Point = 15,10,Route 7
-Point = 16,10,Route 7
-    Description = Rock Cave
-Point = 17,10,Battle Frontier
-    Image = image_battle_frontier
-    Description = Battle Palace\nBattle Tower\nBattle Arena\nBattle Factory
-    FlySpot = 52,17,14
+Point = 16,10,Route 7,Rock Cave
+Point = 17,10,Battle Frontier,,52,17,14
 Point = 12,12,Safari Zone
-    Description = Challenge yourself by catching Pokémon without using your own.
-Point = 13,13,Route 8
-    Image = image_route_8
-    Description = Harbor\nDiving area
-Point = 18,17,Berth Island
-    Description = Four mysterious meteorites can be found here.
-    Switch = 51
-Point = 22,16,Faraday Island
-    Description = A blue Mew can be found here every so often.
-    Switch = 52
+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
-PointSize = 16,16
-Size = 30,20
 Point = 13,16,Here
--- a/PBS/trainer_types.txt
+++ b/PBS/trainer_types.txt
@@ -80,7 +80,6 @@ BaseMoney = 48
 Name = Fisherman
 Gender = Male
 BaseMoney = 32
-PokeBall = LUREBALL
 #-------------------------------
 [GAMBLER]
 Name = Gambler
@@ -92,7 +91,6 @@ SkillLevel = 32
 Name = Gentleman
 Gender = Male
 BaseMoney = 72
-PokeBall = LUXURYBALL
 #-------------------------------
 [HIKER]
 Name = Hiker
@@ -109,7 +107,6 @@ Name = Lady
 Gender = Female
 BaseMoney = 160
 SkillLevel = 72
-PokeBall = LUXURYBALL
 #-------------------------------
 [PAINTER]
 Name = Painter
@@ -125,7 +122,6 @@ BaseMoney = 64
 Name = Pokémon Breeder
 Gender = Female
 BaseMoney = 48
-PokeBall = FRIENDBALL
 #-------------------------------
 [PROFESSOR]
 Name = Professor
@@ -151,7 +147,6 @@ BaseMoney = 32
 Name = Scientist
 Gender = Male
 BaseMoney = 48
-PokeBall = REPEATBALL
 #-------------------------------
 [SUPERNERD]
 Name = Super Nerd
@@ -167,7 +162,6 @@ BaseMoney = 40
 Name = Black Belt
 Gender = Male
 BaseMoney = 32
-PokeBall = ULTRABALL
 #-------------------------------
 [CRUSHGIRL]
 Name = Crush Girl
@@ -188,13 +182,11 @@ BaseMoney = 16
 Name = Cool Trainer
 Gender = Male
 BaseMoney = 60
-PokeBall = ULTRABALL
 #-------------------------------
 [COOLTRAINER_F]
 Name = Cool Trainer
 Gender = Female
 BaseMoney = 60
-PokeBall = ULTRABALL
 #-------------------------------
 [YOUNGSTER]
 Name = Youngster
@@ -231,28 +223,24 @@ Name = Swimmer
 Gender = Male
 BaseMoney = 16
 SkillLevel = 32
-PokeBall = DIVEBALL
 #-------------------------------
 [SWIMMER_F]
 Name = Swimmer
 Gender = Female
 BaseMoney = 16
 SkillLevel = 32
-PokeBall = DIVEBALL
 #-------------------------------
 [SWIMMER2_M]
 Name = Swimmer
 Gender = Male
 BaseMoney = 16
 SkillLevel = 32
-PokeBall = DIVEBALL
 #-------------------------------
 [SWIMMER2_F]
 Name = Swimmer
 Gender = Female
 BaseMoney = 16
 SkillLevel = 32
-PokeBall = DIVEBALL
 #-------------------------------
 [TUBER_M]
 Name = Tuber
@@ -283,7 +271,6 @@ Name = Cool Couple
 Gender = Unknown
 BaseMoney = 72
 SkillLevel = 48
-PokeBall = ULTRABALL
 #-------------------------------
 [CRUSHKIN]
 Name = Crush Kin
@@ -295,7 +282,6 @@ Name = Sis and Bro
 Gender = Unknown
 BaseMoney = 16
 SkillLevel = 48
-PokeBall = DIVEBALL
 #-------------------------------
 [TWINS]
 Name = Twins
@@ -385,7 +371,6 @@ Gender = Female
 BaseMoney = 100
 BattleBGM = Battle Elite
 VictoryBGM = Battle victory leader
-PokeBall = ULTRABALL
 #-------------------------------
 [ELITEFOUR_Bruno]
 Name = Elite Four
@@ -393,7 +378,6 @@ Gender = Male
 BaseMoney = 100
 BattleBGM = Battle Elite
 VictoryBGM = Battle victory leader
-PokeBall = ULTRABALL
 #-------------------------------
 [ELITEFOUR_Agatha]
 Name = Elite Four
@@ -401,7 +385,6 @@ Gender = Female
 BaseMoney = 100
 BattleBGM = Battle Elite
 VictoryBGM = Battle victory leader
-PokeBall = ULTRABALL
 #-------------------------------
 [ELITEFOUR_Lance]
 Name = Elite Four
@@ -409,7 +392,6 @@ Gender = Male
 BaseMoney = 100
 BattleBGM = Battle Elite
 VictoryBGM = Battle victory leader
-PokeBall = ULTRABALL
 #-------------------------------
 [CHAMPION]
 Name = Champion
@@ -417,4 +399,3 @@ Gender = Male
 BaseMoney = 100
 BattleBGM = Battle Champion
 VictoryBGM = Battle victory leader
-PokeBall = ULTRABALL