From 2078f6b116d391a4a07fa16411a3293b8810bd50 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 27 Jun 2023 20:38:15 +0100 Subject: [PATCH] Ensured consistent PBS file layouts, fixed some script file numberings --- .../{010_AITrainer.rb => 009_AITrainer.rb} | 0 .../{011_AIBattler.rb => 010_AIBattler.rb} | 0 .../005_AI/{012_AIMove.rb => 011_AIMove.rb} | 0 PBS/Gen 5/abilities.txt | 4 +- PBS/Gen 5/encounters.txt | 15 +++- PBS/Gen 5/items.txt | 10 +-- PBS/Gen 5/pokemon.txt | 44 +++++----- PBS/Gen 5/pokemon_forms.txt | 50 ++++++------ PBS/Gen 6/abilities.txt | 4 +- PBS/Gen 6/encounters.txt | 15 +++- PBS/Gen 6/items.txt | 10 +-- PBS/Gen 6/pokemon.txt | 68 ++++++++-------- PBS/Gen 7/abilities.txt | 4 +- PBS/Gen 7/encounters.txt | 15 +++- PBS/Gen 7/items.txt | 12 +-- PBS/Gen 7/pokemon.txt | 80 +++++++++---------- PBS/Gen 8/abilities.txt | 8 +- PBS/Gen 8/encounters.txt | 15 +++- PBS/Gen 8/items.txt | 2 +- PBS/Gen 8/pokemon.txt | 8 +- 20 files changed, 196 insertions(+), 168 deletions(-) rename Data/Scripts/011_Battle/005_AI/{010_AITrainer.rb => 009_AITrainer.rb} (100%) rename Data/Scripts/011_Battle/005_AI/{011_AIBattler.rb => 010_AIBattler.rb} (100%) rename Data/Scripts/011_Battle/005_AI/{012_AIMove.rb => 011_AIMove.rb} (100%) diff --git a/Data/Scripts/011_Battle/005_AI/010_AITrainer.rb b/Data/Scripts/011_Battle/005_AI/009_AITrainer.rb similarity index 100% rename from Data/Scripts/011_Battle/005_AI/010_AITrainer.rb rename to Data/Scripts/011_Battle/005_AI/009_AITrainer.rb diff --git a/Data/Scripts/011_Battle/005_AI/011_AIBattler.rb b/Data/Scripts/011_Battle/005_AI/010_AIBattler.rb similarity index 100% rename from Data/Scripts/011_Battle/005_AI/011_AIBattler.rb rename to Data/Scripts/011_Battle/005_AI/010_AIBattler.rb diff --git a/Data/Scripts/011_Battle/005_AI/012_AIMove.rb b/Data/Scripts/011_Battle/005_AI/011_AIMove.rb similarity index 100% rename from Data/Scripts/011_Battle/005_AI/012_AIMove.rb rename to Data/Scripts/011_Battle/005_AI/011_AIMove.rb diff --git a/PBS/Gen 5/abilities.txt b/PBS/Gen 5/abilities.txt index cdad3e64a..5815e8278 100644 --- a/PBS/Gen 5/abilities.txt +++ b/PBS/Gen 5/abilities.txt @@ -158,8 +158,8 @@ Description = The Pokémon is protected from flinching. #------------------------------- [MAGMAARMOR] Name = Magma Armor -Flags = FasterEggHatching Description = Prevents the Pokémon from becoming frozen. +Flags = FasterEggHatching #------------------------------- [WATERVEIL] Name = Water Veil @@ -195,8 +195,8 @@ Description = The Pokémon awakens quickly from sleep. #------------------------------- [FLAMEBODY] Name = Flame Body -Flags = FasterEggHatching Description = Contact with the Pokémon may burn the attacker. +Flags = FasterEggHatching #------------------------------- [RUNAWAY] Name = Run Away diff --git a/PBS/Gen 5/encounters.txt b/PBS/Gen 5/encounters.txt index 98601088a..3300a444b 100644 --- a/PBS/Gen 5/encounters.txt +++ b/PBS/Gen 5/encounters.txt @@ -32,6 +32,8 @@ LandNight,21 9,HOOTHOOT,10,14 1,HOOTHOOT,14 1,RATTATA,15 +PokeRadar,20 + 100,STARLY,12,15 #------------------------------- [005,1] # Route 1 Land,21 @@ -77,6 +79,8 @@ HeadbuttHigh 50,PINECO,11,13 30,WURMPLE,6,8 20,SPINARAK,9,12 +PokeRadar,10 + 100,STANTLER,14 #------------------------------- [028] # Natural Park Land,21 @@ -110,6 +114,9 @@ BugContest,21 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 @@ -185,7 +192,7 @@ RockSmash,50 90,NOSEPASS,13,14 10,GEODUDE,12,15 #------------------------------- -[049] # Rock Cave +[049] # Rock Cave 1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -194,7 +201,7 @@ Cave,5 10,GEODUDE,13,15 10,MAWILE,14,16 #------------------------------- -[050] # Rock Cave +[050] # Rock Cave B1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -212,7 +219,7 @@ Cave,5 10,RIOLU,1 10,TYROGUE,1 #------------------------------- -[066] # Safari Zone +[066] # Safari Zone outside Land,21 20,ABRA,12,15 20,DODUO,13,15 @@ -282,7 +289,7 @@ SuperRod 15,CORSOLA,15,18 5,STARYU,15,17 #------------------------------- -[070] # Underwater +[070] # Route 8 underwater Land,21 20,CHINCHOU,17,21 20,CLAMPERL,18,20 diff --git a/PBS/Gen 5/items.txt b/PBS/Gen 5/items.txt index 255d5bcc1..7a012d507 100644 --- a/PBS/Gen 5/items.txt +++ b/PBS/Gen 5/items.txt @@ -33,8 +33,8 @@ NamePlural = Black Flutes Pocket = 1 Price = 400 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear. #------------------------------- [WHITEFLUTE] @@ -43,8 +43,8 @@ NamePlural = White Flutes Pocket = 1 Price = 500 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear. #------------------------------- [HONEY] @@ -4548,8 +4548,8 @@ Pocket = 7 Price = 100 FieldUse = OnPokemon BattleUse = OnPokemon -Consumable = false Flags = Fling_30 +Consumable = false Description = A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep. #------------------------------- [YELLOWFLUTE] @@ -4558,8 +4558,8 @@ NamePlural = Yellow Flutes Pocket = 7 Price = 300 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A yellow flute made from blown glass. Its melody snaps a single Pokémon out of confusion. #------------------------------- [REDFLUTE] @@ -4568,8 +4568,8 @@ NamePlural = Red Flutes Pocket = 7 Price = 200 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A red flute made from blown glass. Its melody snaps a single Pokémon out of infatuation. #------------------------------- [POKEDOLL] diff --git a/PBS/Gen 5/pokemon.txt b/PBS/Gen 5/pokemon.txt index 8b3caec32..783e19b17 100644 --- a/PBS/Gen 5/pokemon.txt +++ b/PBS/Gen 5/pokemon.txt @@ -5294,6 +5294,7 @@ Evolutions = MISMAGIUS,Item,DUSKSTONE #------------------------------- [UNOWN] Name = Unown +FormName = A Types = PSYCHIC BaseStats = 48,72,48,48,72,48 GenderRatio = Genderless @@ -5313,7 +5314,6 @@ Shape = Head Habitat = Rare Category = Symbol Pokedex = This Pokémon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown. -FormName = Anger Generation = 2 #------------------------------- [WOBBUFFET] @@ -9251,6 +9251,7 @@ Generation = 3 #------------------------------- [CASTFORM] Name = Castform +FormName = Normal Form Types = NORMAL BaseStats = 70,70,70,70,70,70 GenderRatio = Female50Percent @@ -9272,7 +9273,6 @@ Shape = Head Habitat = Grassland Category = Weather Pokedex = It alters its form depending on the weather. Changes in the climate such as the temperature and humidity appear to affect its cellular structure. -FormName = Normal Form Generation = 3 WildItemCommon = MYSTICWATER WildItemUncommon = MYSTICWATER @@ -10175,6 +10175,7 @@ WildItemRare = STARPIECE #------------------------------- [DEOXYS] Name = Deoxys +FormName = Normal Forme Types = PSYCHIC BaseStats = 50,150,50,150,150,50 GenderRatio = Genderless @@ -10195,7 +10196,6 @@ Shape = Bipedal Habitat = Rare Category = DNA Pokedex = A Pokémon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed. -FormName = Normal Forme Generation = 3 Flags = Mythical #------------------------------- @@ -10835,6 +10835,7 @@ Generation = 4 #------------------------------- [BURMY] Name = Burmy +FormName = Plant Cloak Types = BUG BaseStats = 40,29,45,36,29,45 GenderRatio = Female50Percent @@ -10855,13 +10856,13 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20 #------------------------------- [WORMADAM] Name = Wormadam +FormName = Plant Cloak Types = BUG,GRASS BaseStats = 60,59,85,36,79,105 GenderRatio = AlwaysFemale @@ -10882,7 +10883,6 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = When Burmy evolved, its cloak became a part of this Pokémon's body. The cloak is never shed. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother WildItemUncommon = SILVERPOWDER @@ -11069,6 +11069,7 @@ Evolutions = CHERRIM,Level,25 #------------------------------- [CHERRIM] Name = Cherrim +FormName = Overcast Form Types = GRASS BaseStats = 70,60,70,85,87,78 GenderRatio = Female50Percent @@ -11088,12 +11089,12 @@ Color = Purple Shape = HeadLegs Category = Blossom Pokedex = It blooms during times of strong sunlight. It tries to make up for everything it endured as a bud. -FormName = Overcast Form Generation = 4 WildItemUncommon = MIRACLESEED #------------------------------- [SHELLOS] Name = Shellos +FormName = West Sea Types = WATER BaseStats = 76,48,48,34,57,62 GenderRatio = Female50Percent @@ -11115,13 +11116,13 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother Evolutions = GASTRODON,Level,30 #------------------------------- [GASTRODON] Name = Gastrodon +FormName = West Sea Types = WATER,GROUND BaseStats = 111,83,68,39,92,82 GenderRatio = Female50Percent @@ -11142,7 +11143,6 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = It has a pliable body without any bones. If any part of its body is torn off, it grows right back. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother #------------------------------- @@ -12547,6 +12547,7 @@ WildItemUncommon = BABIRIBERRY #------------------------------- [ROTOM] Name = Rotom +FormName = Normal Rotom Types = ELECTRIC,GHOST BaseStats = 50,50,77,91,95,77 GenderRatio = Genderless @@ -12566,7 +12567,6 @@ Color = Red Shape = Head Category = Plasma Pokedex = Its body is composed of plasma. It is known to infiltrate electronic devices and wreak havoc. -FormName = Normal Rotom Generation = 4 #------------------------------- [UXIE] @@ -12742,6 +12742,7 @@ Flags = Legendary #------------------------------- [GIRATINA] Name = Giratina +FormName = Altered Forme Types = GHOST,DRAGON BaseStats = 150,100,120,90,100,120 GenderRatio = Genderless @@ -12762,7 +12763,6 @@ Color = Black Shape = Multiped Category = Renegade Pokedex = A Pokémon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery. -FormName = Altered Forme Generation = 4 Flags = Legendary #------------------------------- @@ -12865,6 +12865,7 @@ Flags = Mythical #------------------------------- [SHAYMIN] Name = Shaymin +FormName = Land Forme Types = GRASS BaseStats = 100,100,100,100,100,100 GenderRatio = Genderless @@ -12884,7 +12885,6 @@ Color = Green Shape = Quadruped Category = Gratitude Pokedex = It lives in flower patches and avoids detection by curling up to look like a flowering plant. -FormName = Land Forme Generation = 4 Flags = Mythical WildItemCommon = LUMBERRY @@ -12893,6 +12893,7 @@ WildItemRare = LUMBERRY #------------------------------- [ARCEUS] Name = Arceus +FormName = Normal Type Types = NORMAL BaseStats = 120,120,120,120,120,120 GenderRatio = Genderless @@ -12912,7 +12913,6 @@ Color = White Shape = Quadruped Category = Alpha Pokedex = It is described in mythology as the Pokémon that shaped the universe with its 1,000 arms. -FormName = Normal Type Generation = 4 Flags = Mythical #------------------------------- @@ -14353,6 +14353,7 @@ Generation = 5 #------------------------------- [BASCULIN] Name = Basculin +FormName = Red-Striped Types = WATER BaseStats = 70,92,65,98,80,55 GenderRatio = Female50Percent @@ -14374,7 +14375,6 @@ Color = Green Shape = Finned Category = Hostile Pokedex = Red and blue Basculin usually do not get along, but sometimes members of one school mingle with the other's schooL. -FormName = Red-Striped Generation = 5 Flags = InheritFormFromMother WildItemUncommon = DEEPSEATOOTH @@ -14483,6 +14483,7 @@ Evolutions = DARMANITAN,Level,35 #------------------------------- [DARMANITAN] Name = Darmanitan +FormName = Standard Mode Types = FIRE BaseStats = 105,140,55,95,30,55 GenderRatio = Female50Percent @@ -14503,7 +14504,6 @@ Color = Red Shape = Quadruped Category = Blazing Pokedex = When weakened in battle, it transforms into a stone statue. Then it sharpens its mind and fights on mentally. -FormName = Standard Mode Generation = 5 WildItemCommon = RAWSTBERRY #------------------------------- @@ -15250,6 +15250,7 @@ Generation = 5 #------------------------------- [DEERLING] Name = Deerling +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 60,60,50,75,40,50 GenderRatio = Female50Percent @@ -15271,12 +15272,12 @@ Color = Pink Shape = Quadruped Category = Season Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons. -FormName = Spring Form Generation = 5 Evolutions = SAWSBUCK,Level,34 #------------------------------- [SAWSBUCK] Name = Sawsbuck +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 80,100,70,95,60,70 GenderRatio = Female50Percent @@ -15297,7 +15298,6 @@ Color = Brown Shape = Quadruped Category = Season Pokedex = The plants growing on its horns change according to the season. The leaders of the herd possess magnificent horns. -FormName = Spring Form Generation = 5 #------------------------------- [EMOLGA] @@ -16657,6 +16657,7 @@ Flags = Legendary #------------------------------- [TORNADUS] Name = Tornadus +FormName = Incarnate Forme Types = FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16677,12 +16678,12 @@ Color = Green Shape = HeadArms Category = Cyclone Pokedex = Tornadus expels massive energy from its tail, causing severe storms. Its power is great enough to blow houses away. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- [THUNDURUS] Name = Thundurus +FormName = Incarnate Forme Types = ELECTRIC,FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16703,7 +16704,6 @@ Color = Blue Shape = HeadArms Category = Bolt Strike Pokedex = The spikes on its tail discharge immense bolts of lightning. It flies around the Unova region firing off lightning bolts. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16757,6 +16757,7 @@ Flags = Legendary #------------------------------- [LANDORUS] Name = Landorus +FormName = Incarnate Forme Types = GROUND,FLYING BaseStats = 89,125,90,101,115,80 GenderRatio = AlwaysMale @@ -16777,7 +16778,6 @@ Color = Brown Shape = HeadArms Category = Abundance Pokedex = The energy that comes pouring from its tail increases the nutrition in the soil, making crops grow to great size. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16807,6 +16807,7 @@ Flags = Legendary #------------------------------- [KELDEO] Name = Keldeo +FormName = Ordinary Form Types = WATER,FIGHTING BaseStats = 91,72,90,108,129,90 GenderRatio = Genderless @@ -16826,12 +16827,12 @@ Color = Yellow Shape = Quadruped Category = Colt Pokedex = It crosses the world, running over the surfaces of oceans and rivers. It appears at scenic waterfronts. -FormName = Ordinary Form Generation = 5 Flags = Mythical #------------------------------- [MELOETTA] Name = Meloetta +FormName = Aria Forme Types = NORMAL,PSYCHIC BaseStats = 100,77,77,90,128,128 GenderRatio = Genderless @@ -16851,7 +16852,6 @@ Color = White Shape = Bipedal Category = Melody Pokedex = Many famous songs have been inspired by the melodies that Meloetta plays. -FormName = Aria Forme Generation = 5 Flags = Mythical WildItemCommon = STARPIECE @@ -16860,6 +16860,7 @@ WildItemRare = STARPIECE #------------------------------- [GENESECT] Name = Genesect +FormName = Normal Types = BUG,STEEL BaseStats = 71,120,95,99,120,95 GenderRatio = Genderless @@ -16879,6 +16880,5 @@ Color = Purple Shape = Bipedal Category = Paleozoic Pokedex = This ancient bug Pokémon was altered by Team Plasma. They upgraded the cannon on its back. -FormName = Normal Generation = 5 Flags = Mythical diff --git a/PBS/Gen 5/pokemon_forms.txt b/PBS/Gen 5/pokemon_forms.txt index ba052f9b4..27a6aa6e3 100644 --- a/PBS/Gen 5/pokemon_forms.txt +++ b/PBS/Gen 5/pokemon_forms.txt @@ -6,79 +6,79 @@ Generation = 4 Evolutions = PIKACHU,None, #------------------------------- [UNOWN,1] -FormName = Bear +FormName = B #------------------------------- [UNOWN,2] -FormName = Chase +FormName = C #------------------------------- [UNOWN,3] -FormName = Direct +FormName = D #------------------------------- [UNOWN,4] -FormName = Engage +FormName = E #------------------------------- [UNOWN,5] -FormName = Find +FormName = F #------------------------------- [UNOWN,6] -FormName = Give +FormName = G #------------------------------- [UNOWN,7] -FormName = Help +FormName = H #------------------------------- [UNOWN,8] -FormName = Increase +FormName = I #------------------------------- [UNOWN,9] -FormName = Join +FormName = J #------------------------------- [UNOWN,10] -FormName = Keep +FormName = K #------------------------------- [UNOWN,11] -FormName = Laugh +FormName = L #------------------------------- [UNOWN,12] -FormName = Make +FormName = M #------------------------------- [UNOWN,13] -FormName = Nuzzle +FormName = N #------------------------------- [UNOWN,14] -FormName = Observe +FormName = O #------------------------------- [UNOWN,15] -FormName = Perform +FormName = P #------------------------------- [UNOWN,16] -FormName = Quicken +FormName = Q #------------------------------- [UNOWN,17] -FormName = Reassure +FormName = R #------------------------------- [UNOWN,18] -FormName = Search +FormName = S #------------------------------- [UNOWN,19] -FormName = Tell +FormName = T #------------------------------- [UNOWN,20] -FormName = Undo +FormName = U #------------------------------- [UNOWN,21] -FormName = Vanish +FormName = V #------------------------------- [UNOWN,22] -FormName = Want +FormName = W #------------------------------- [UNOWN,23] -FormName = XXXXX +FormName = X #------------------------------- [UNOWN,24] -FormName = Yield +FormName = Y #------------------------------- [UNOWN,25] -FormName = Zoom +FormName = Z #------------------------------- [UNOWN,26] FormName = ? diff --git a/PBS/Gen 6/abilities.txt b/PBS/Gen 6/abilities.txt index ff1d2411c..56c7716b8 100644 --- a/PBS/Gen 6/abilities.txt +++ b/PBS/Gen 6/abilities.txt @@ -158,8 +158,8 @@ Description = The Pokémon is protected from flinching. #------------------------------- [MAGMAARMOR] Name = Magma Armor -Flags = FasterEggHatching Description = Prevents the Pokémon from becoming frozen. +Flags = FasterEggHatching #------------------------------- [WATERVEIL] Name = Water Veil @@ -195,8 +195,8 @@ Description = The Pokémon awakens quickly from sleep. #------------------------------- [FLAMEBODY] Name = Flame Body -Flags = FasterEggHatching Description = Contact with the Pokémon may burn the attacker. +Flags = FasterEggHatching #------------------------------- [RUNAWAY] Name = Run Away diff --git a/PBS/Gen 6/encounters.txt b/PBS/Gen 6/encounters.txt index 98601088a..3300a444b 100644 --- a/PBS/Gen 6/encounters.txt +++ b/PBS/Gen 6/encounters.txt @@ -32,6 +32,8 @@ LandNight,21 9,HOOTHOOT,10,14 1,HOOTHOOT,14 1,RATTATA,15 +PokeRadar,20 + 100,STARLY,12,15 #------------------------------- [005,1] # Route 1 Land,21 @@ -77,6 +79,8 @@ HeadbuttHigh 50,PINECO,11,13 30,WURMPLE,6,8 20,SPINARAK,9,12 +PokeRadar,10 + 100,STANTLER,14 #------------------------------- [028] # Natural Park Land,21 @@ -110,6 +114,9 @@ BugContest,21 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 @@ -185,7 +192,7 @@ RockSmash,50 90,NOSEPASS,13,14 10,GEODUDE,12,15 #------------------------------- -[049] # Rock Cave +[049] # Rock Cave 1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -194,7 +201,7 @@ Cave,5 10,GEODUDE,13,15 10,MAWILE,14,16 #------------------------------- -[050] # Rock Cave +[050] # Rock Cave B1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -212,7 +219,7 @@ Cave,5 10,RIOLU,1 10,TYROGUE,1 #------------------------------- -[066] # Safari Zone +[066] # Safari Zone outside Land,21 20,ABRA,12,15 20,DODUO,13,15 @@ -282,7 +289,7 @@ SuperRod 15,CORSOLA,15,18 5,STARYU,15,17 #------------------------------- -[070] # Underwater +[070] # Route 8 underwater Land,21 20,CHINCHOU,17,21 20,CLAMPERL,18,20 diff --git a/PBS/Gen 6/items.txt b/PBS/Gen 6/items.txt index 930512dcc..93b5c574e 100644 --- a/PBS/Gen 6/items.txt +++ b/PBS/Gen 6/items.txt @@ -33,8 +33,8 @@ NamePlural = Black Flutes Pocket = 1 Price = 400 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear. #------------------------------- [WHITEFLUTE] @@ -43,8 +43,8 @@ NamePlural = White Flutes Pocket = 1 Price = 500 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear. #------------------------------- [HONEY] @@ -5206,8 +5206,8 @@ Pocket = 7 Price = 100 FieldUse = OnPokemon BattleUse = OnPokemon -Consumable = false Flags = Fling_30 +Consumable = false Description = A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep. #------------------------------- [YELLOWFLUTE] @@ -5216,8 +5216,8 @@ NamePlural = Yellow Flutes Pocket = 7 Price = 300 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A yellow flute made from blown glass. Its melody snaps a single Pokémon out of confusion. #------------------------------- [REDFLUTE] @@ -5226,8 +5226,8 @@ NamePlural = Red Flutes Pocket = 7 Price = 200 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A red flute made from blown glass. Its melody snaps a single Pokémon out of infatuation. #------------------------------- [POKEDOLL] diff --git a/PBS/Gen 6/pokemon.txt b/PBS/Gen 6/pokemon.txt index 254d6531f..46e723ac7 100644 --- a/PBS/Gen 6/pokemon.txt +++ b/PBS/Gen 6/pokemon.txt @@ -5277,6 +5277,7 @@ Evolutions = MISMAGIUS,Item,DUSKSTONE #------------------------------- [UNOWN] Name = Unown +FormName = A Types = PSYCHIC BaseStats = 48,72,48,48,72,48 GenderRatio = Genderless @@ -5297,7 +5298,6 @@ Shape = Head Habitat = Rare Category = Symbol Pokedex = This Pokémon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown. -FormName = A Generation = 2 #------------------------------- [WOBBUFFET] @@ -9241,6 +9241,7 @@ Generation = 3 #------------------------------- [CASTFORM] Name = Castform +FormName = Normal Form Types = NORMAL BaseStats = 70,70,70,70,70,70 GenderRatio = Female50Percent @@ -9262,7 +9263,6 @@ Shape = Head Habitat = Grassland Category = Weather Pokedex = It alters its form depending on the weather. Changes in the climate such as the temperature and humidity appear to affect its cellular structure. -FormName = Normal Form Generation = 3 WildItemCommon = MYSTICWATER WildItemUncommon = MYSTICWATER @@ -10169,6 +10169,7 @@ WildItemRare = STARPIECE #------------------------------- [DEOXYS] Name = Deoxys +FormName = Normal Forme Types = PSYCHIC BaseStats = 50,150,50,150,150,50 GenderRatio = Genderless @@ -10189,7 +10190,6 @@ Shape = Bipedal Habitat = Rare Category = DNA Pokedex = A Pokémon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed. -FormName = Normal Forme Generation = 3 Flags = Mythical #------------------------------- @@ -10824,6 +10824,7 @@ Generation = 4 #------------------------------- [BURMY] Name = Burmy +FormName = Plant Cloak Types = BUG BaseStats = 40,29,45,36,29,45 GenderRatio = Female50Percent @@ -10844,13 +10845,13 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20 #------------------------------- [WORMADAM] Name = Wormadam +FormName = Plant Cloak Types = BUG,GRASS BaseStats = 60,59,85,36,79,105 GenderRatio = AlwaysFemale @@ -10871,7 +10872,6 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = When Burmy evolved, its cloak became a part of this Pokémon's body. The cloak is never shed. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother WildItemUncommon = SILVERPOWDER @@ -11056,6 +11056,7 @@ Evolutions = CHERRIM,Level,25 #------------------------------- [CHERRIM] Name = Cherrim +FormName = Overcast Form Types = GRASS BaseStats = 70,60,70,85,87,78 GenderRatio = Female50Percent @@ -11075,12 +11076,12 @@ Color = Purple Shape = HeadLegs Category = Blossom Pokedex = It blooms during times of strong sunlight. It tries to make up for everything it endured as a bud. -FormName = Overcast Form Generation = 4 WildItemUncommon = MIRACLESEED #------------------------------- [SHELLOS] Name = Shellos +FormName = West Sea Types = WATER BaseStats = 76,48,48,34,57,62 GenderRatio = Female50Percent @@ -11102,13 +11103,13 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother Evolutions = GASTRODON,Level,30 #------------------------------- [GASTRODON] Name = Gastrodon +FormName = West Sea Types = WATER,GROUND BaseStats = 111,83,68,39,92,82 GenderRatio = Female50Percent @@ -11129,7 +11130,6 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = It has a pliable body without any bones. If any part of its body is torn off, it grows right back. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother #------------------------------- @@ -12523,6 +12523,7 @@ Generation = 4 #------------------------------- [ROTOM] Name = Rotom +FormName = Rotom Types = ELECTRIC,GHOST BaseStats = 50,50,77,91,95,77 GenderRatio = Genderless @@ -12542,7 +12543,6 @@ Color = Red Shape = Head Category = Plasma Pokedex = Its body is composed of plasma. It is known to infiltrate electronic devices and wreak havoc. -FormName = Rotom Generation = 4 #------------------------------- [UXIE] @@ -12718,6 +12718,7 @@ Flags = Legendary #------------------------------- [GIRATINA] Name = Giratina +FormName = Altered Forme Types = GHOST,DRAGON BaseStats = 150,100,120,90,100,120 GenderRatio = Genderless @@ -12738,7 +12739,6 @@ Color = Black Shape = Multiped Category = Renegade Pokedex = A Pokémon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery. -FormName = Altered Forme Generation = 4 Flags = Legendary #------------------------------- @@ -12841,6 +12841,7 @@ Flags = Mythical #------------------------------- [SHAYMIN] Name = Shaymin +FormName = Land Forme Types = GRASS BaseStats = 100,100,100,100,100,100 GenderRatio = Genderless @@ -12860,7 +12861,6 @@ Color = Green Shape = Quadruped Category = Gratitude Pokedex = It lives in flower patches and avoids detection by curling up to look like a flowering plant. -FormName = Land Forme Generation = 4 Flags = Mythical WildItemCommon = LUMBERRY @@ -12869,6 +12869,7 @@ WildItemRare = LUMBERRY #------------------------------- [ARCEUS] Name = Arceus +FormName = Normal Type Types = NORMAL BaseStats = 120,120,120,120,120,120 GenderRatio = Genderless @@ -12888,7 +12889,6 @@ Color = White Shape = Quadruped Category = Alpha Pokedex = It is described in mythology as the Pokémon that shaped the universe with its 1,000 arms. -FormName = Normal Type Generation = 4 Flags = Mythical #------------------------------- @@ -14307,6 +14307,7 @@ Generation = 5 #------------------------------- [BASCULIN] Name = Basculin +FormName = Red-Striped Types = WATER BaseStats = 70,92,65,98,80,55 GenderRatio = Female50Percent @@ -14328,7 +14329,6 @@ Color = Green Shape = Finned Category = Hostile Pokedex = Savage, violent Pokémon, red and blue Basculin are always fighting each other over territory. -FormName = Red-Striped Generation = 5 Flags = InheritFormFromMother WildItemUncommon = DEEPSEATOOTH @@ -14436,6 +14436,7 @@ Evolutions = DARMANITAN,Level,35 #------------------------------- [DARMANITAN] Name = Darmanitan +FormName = Standard Mode Types = FIRE BaseStats = 105,140,55,95,30,55 GenderRatio = Female50Percent @@ -14456,7 +14457,6 @@ Color = Red Shape = Quadruped Category = Blazing Pokedex = When weakened in battle, it transforms into a stone statue. Then it sharpens its mind and fights on mentally. -FormName = Standard Mode Generation = 5 #------------------------------- [MARACTUS] @@ -15190,6 +15190,7 @@ Generation = 5 #------------------------------- [DEERLING] Name = Deerling +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 60,60,50,75,40,50 GenderRatio = Female50Percent @@ -15211,12 +15212,12 @@ Color = Pink Shape = Quadruped Category = Season Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons. -FormName = Spring Form Generation = 5 Evolutions = SAWSBUCK,Level,34 #------------------------------- [SAWSBUCK] Name = Sawsbuck +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 80,100,70,95,60,70 GenderRatio = Female50Percent @@ -15237,7 +15238,6 @@ Color = Brown Shape = Quadruped Category = Season Pokedex = The plants growing on its horns change according to the season. The leaders of the herd possess magnificent horns. -FormName = Spring Form Generation = 5 #------------------------------- [EMOLGA] @@ -16590,6 +16590,7 @@ Flags = Legendary #------------------------------- [TORNADUS] Name = Tornadus +FormName = Incarnate Forme Types = FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16610,12 +16611,12 @@ Color = Green Shape = HeadArms Category = Cyclone Pokedex = Tornadus expels massive energy from its tail, causing severe storms. Its power is great enough to blow houses away. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- [THUNDURUS] Name = Thundurus +FormName = Incarnate Forme Types = ELECTRIC,FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16636,7 +16637,6 @@ Color = Blue Shape = HeadArms Category = Bolt Strike Pokedex = The spikes on its tail discharge immense bolts of lightning. It flies around the Unova region firing off lightning bolts. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16690,6 +16690,7 @@ Flags = Legendary #------------------------------- [LANDORUS] Name = Landorus +FormName = Incarnate Forme Types = GROUND,FLYING BaseStats = 89,125,90,101,115,80 GenderRatio = AlwaysMale @@ -16710,7 +16711,6 @@ Color = Brown Shape = HeadArms Category = Abundance Pokedex = The energy that comes pouring from its tail increases the nutrition in the soil, making crops grow to great size. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16740,6 +16740,7 @@ Flags = Legendary #------------------------------- [KELDEO] Name = Keldeo +FormName = Ordinary Form Types = WATER,FIGHTING BaseStats = 91,72,90,108,129,90 GenderRatio = Genderless @@ -16759,12 +16760,12 @@ Color = Yellow Shape = Quadruped Category = Colt Pokedex = It crosses the world, running over the surfaces of oceans and rivers. It appears at scenic waterfronts. -FormName = Ordinary Form Generation = 5 Flags = Mythical #------------------------------- [MELOETTA] Name = Meloetta +FormName = Aria Forme Types = NORMAL,PSYCHIC BaseStats = 100,77,77,90,128,128 GenderRatio = Genderless @@ -16784,7 +16785,6 @@ Color = White Shape = Bipedal Category = Melody Pokedex = Many famous songs have been inspired by the melodies that Meloetta plays. -FormName = Aria Forme Generation = 5 Flags = Mythical WildItemCommon = STARPIECE @@ -16793,6 +16793,7 @@ WildItemRare = STARPIECE #------------------------------- [GENESECT] Name = Genesect +FormName = Normal Types = BUG,STEEL BaseStats = 71,120,95,99,120,95 GenderRatio = Genderless @@ -16812,7 +16813,6 @@ Color = Purple Shape = Bipedal Category = Paleozoic Pokedex = This ancient bug Pokémon was altered by Team Plasma. They upgraded the cannon on its back. -FormName = Normal Generation = 5 Flags = Mythical #------------------------------- @@ -17219,6 +17219,7 @@ Evolutions = VIVILLON,Level,12 #------------------------------- [VIVILLON] Name = Vivillon +FormName = Archipelago Pattern Types = BUG,FLYING BaseStats = 80,52,50,89,90,50 GenderRatio = Female50Percent @@ -17239,7 +17240,6 @@ Color = White Shape = MultiWinged Category = Scale Pokedex = Vivillon with many different patterns are found all over the world. These patterns are affected by the climate of their habitat. -FormName = Archipelago Pattern Generation = 6 #------------------------------- [LITLEO] @@ -17294,6 +17294,7 @@ Generation = 6 #------------------------------- [FLABEBE] Name = Flabébé +FormName = Red Flower Types = FAIRY BaseStats = 44,38,39,42,61,79 GenderRatio = AlwaysFemale @@ -17315,13 +17316,13 @@ Color = White Shape = HeadArms Category = Single Bloom Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother Evolutions = FLOETTE,Level,19 #------------------------------- [FLOETTE] Name = Floette +FormName = Red Flower Types = FAIRY BaseStats = 54,45,47,52,75,98 GenderRatio = AlwaysFemale @@ -17342,13 +17343,13 @@ Color = White Shape = HeadArms Category = Single Bloom Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother Evolutions = FLORGES,Item,SHINYSTONE #------------------------------- [FLORGES] Name = Florges +FormName = Red Flower Types = FAIRY BaseStats = 78,65,68,75,112,154 GenderRatio = AlwaysFemale @@ -17369,7 +17370,6 @@ Color = White Shape = HeadArms Category = Garden Pokedex = It claims exquisite flower gardens as its territory, and it obtains power from basking in the energy emitted by flowering plants. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother #------------------------------- @@ -17477,6 +17477,7 @@ WildItemUncommon = MENTALHERB #------------------------------- [FURFROU] Name = Furfrou +FormName = Natural Form Types = NORMAL BaseStats = 75,80,60,102,65,90 GenderRatio = Female50Percent @@ -17497,7 +17498,6 @@ Color = White Shape = Quadruped Category = Poodle Pokedex = Trimming its fluffy fur not only makes it more elegant but also increases the swiftness of its movements. -FormName = Natural Form Generation = 6 #------------------------------- [ESPURR] @@ -17528,6 +17528,7 @@ Evolutions = MEOWSTIC,Level,25 #------------------------------- [MEOWSTIC] Name = Meowstic +FormName = Male Types = PSYCHIC BaseStats = 74,48,76,104,83,81 GenderRatio = Female50Percent @@ -17548,7 +17549,6 @@ Color = Blue Shape = BipedalTail Category = Constraint Pokedex = When in danger, it raises its ears and releases enough psychic power to grind a 10-ton truck to dust. -FormName = Male Generation = 6 #------------------------------- [HONEDGE] @@ -17602,6 +17602,7 @@ Evolutions = AEGISLASH,Item,DUSKSTONE #------------------------------- [AEGISLASH] Name = Aegislash +FormName = Shield Forme Types = STEEL,GHOST BaseStats = 60,50,150,60,50,150 GenderRatio = Female50Percent @@ -17621,7 +17622,6 @@ Color = Brown Shape = HeadBase Category = Royal Sword Pokedex = Apparently, it can detect the innate qualities of leadership. According to legend, whoever it recognizes is destined to become king. -FormName = Shield Forme Generation = 6 #------------------------------- [SPRITZEE] @@ -18323,6 +18323,7 @@ Generation = 6 #------------------------------- [PUMPKABOO] Name = Pumpkaboo +FormName = Small Size Types = GHOST,GRASS BaseStats = 44,66,70,56,44,55 GenderRatio = Female50Percent @@ -18343,13 +18344,13 @@ Color = Brown Shape = Head Category = Pumpkin Pokedex = The pumpkin body is inhabited by a spirit trapped in this world. As the sun sets, it becomes restless and active. -FormName = Small Size Generation = 6 Flags = InheritFormFromMother Evolutions = GOURGEIST,Trade, #------------------------------- [GOURGEIST] Name = Gourgeist +FormName = Small Size Types = GHOST,GRASS BaseStats = 55,85,122,99,58,75 GenderRatio = Female50Percent @@ -18369,7 +18370,6 @@ Color = Brown Shape = HeadBase Category = Pumpkin Pokedex = Singing in eerie voices, they wander town streets on the night of the new moon. Anyone who hears their song is cursed. -FormName = Small Size Generation = 6 Flags = InheritFormFromMother #------------------------------- @@ -18475,6 +18475,7 @@ Generation = 6 #------------------------------- [XERNEAS] Name = Xerneas +FormName = Neutral Mode Types = FAIRY BaseStats = 126,131,95,99,131,98 GenderRatio = Genderless @@ -18494,7 +18495,6 @@ Color = Blue Shape = Quadruped Category = Life Pokedex = Legends say it can share eternal life. It slept for a thousand years in the form of a tree before its revival. -FormName = Neutral Mode Generation = 6 Flags = Legendary #------------------------------- @@ -18524,6 +18524,7 @@ Flags = Legendary #------------------------------- [ZYGARDE] Name = Zygarde +FormName = 50% Forme Types = DRAGON,GROUND BaseStats = 108,100,121,95,81,95 GenderRatio = Genderless @@ -18543,7 +18544,6 @@ Color = Green Shape = Serpentine Category = Order Pokedex = It's thought to be monitoring the ecosystem. There are rumors that even greater power lies hidden within it. -FormName = 50% Forme Generation = 6 Flags = Legendary #------------------------------- @@ -18573,6 +18573,7 @@ Flags = Mythical #------------------------------- [HOOPA] Name = Hoopa +FormName = Hoopa Confined Types = PSYCHIC,GHOST BaseStats = 80,110,60,70,150,130 GenderRatio = Genderless @@ -18592,7 +18593,6 @@ Color = Purple Shape = HeadArms Category = Mischief Pokedex = This troublemaker sends anything and everything to faraway places using its loop, which can warp space. -FormName = Hoopa Confined Generation = 6 Flags = Mythical #------------------------------- diff --git a/PBS/Gen 7/abilities.txt b/PBS/Gen 7/abilities.txt index 82d259692..d773d1807 100644 --- a/PBS/Gen 7/abilities.txt +++ b/PBS/Gen 7/abilities.txt @@ -158,8 +158,8 @@ Description = The Pokémon is protected from flinching. #------------------------------- [MAGMAARMOR] Name = Magma Armor -Flags = FasterEggHatching Description = Prevents the Pokémon from becoming frozen. +Flags = FasterEggHatching #------------------------------- [WATERVEIL] Name = Water Veil @@ -195,8 +195,8 @@ Description = The Pokémon awakens quickly from sleep. #------------------------------- [FLAMEBODY] Name = Flame Body -Flags = FasterEggHatching Description = Contact with the Pokémon may burn the attacker. +Flags = FasterEggHatching #------------------------------- [RUNAWAY] Name = Run Away diff --git a/PBS/Gen 7/encounters.txt b/PBS/Gen 7/encounters.txt index 821028696..d6659ac63 100644 --- a/PBS/Gen 7/encounters.txt +++ b/PBS/Gen 7/encounters.txt @@ -32,6 +32,8 @@ LandNight,21 9,HOOTHOOT,10,14 1,HOOTHOOT,14 1,RATTATA,15 +PokeRadar,20 + 100,STARLY,12,15 #------------------------------- [005,1] # Route 1 Land,21 @@ -77,6 +79,8 @@ HeadbuttHigh 50,PINECO,11,13 30,WURMPLE,6,8 20,SPINARAK,9,12 +PokeRadar,10 + 100,STANTLER,14 #------------------------------- [028] # Natural Park Land,21 @@ -110,6 +114,9 @@ BugContest,21 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 @@ -185,7 +192,7 @@ RockSmash,50 90,NOSEPASS,13,14 10,GEODUDE,12,15 #------------------------------- -[049] # Rock Cave +[049] # Rock Cave 1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -194,7 +201,7 @@ Cave,5 10,GEODUDE,13,15 10,MAWILE,14,16 #------------------------------- -[050] # Rock Cave +[050] # Rock Cave B1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -212,7 +219,7 @@ Cave,5 10,RIOLU,1 10,TYROGUE,1 #------------------------------- -[066] # Safari Zone +[066] # Safari Zone outside Land,21 20,ABRA,12,15 20,DODUO,13,15 @@ -282,7 +289,7 @@ SuperRod 15,CORSOLA,15,18 5,STARYU,15,17 #------------------------------- -[070] # Underwater +[070] # Route 8 underwater Land,21 20,CHINCHOU,17,21 20,CLAMPERL,18,20 diff --git a/PBS/Gen 7/items.txt b/PBS/Gen 7/items.txt index 245044011..b7669688f 100644 --- a/PBS/Gen 7/items.txt +++ b/PBS/Gen 7/items.txt @@ -33,8 +33,8 @@ NamePlural = Black Flutes Pocket = 1 Price = 400 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear. #------------------------------- [WHITEFLUTE] @@ -43,8 +43,8 @@ NamePlural = White Flutes Pocket = 1 Price = 500 FieldUse = Direct -Consumable = false Flags = Fling_30 +Consumable = false Description = A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear. #------------------------------- [HONEY] @@ -56,7 +56,7 @@ Pocket = 1 Price = 300 FieldUse = Direct Flags = Fling_30 -Description = A sweet honey with an aroma that attracts wild Pokémon when used in grass, caves or on special trees. +Description = A sweet honey with an aroma that attracts wild Pokémon when used in tall grass, in caves, or elsewhere. #------------------------------- [ESCAPEROPE] Name = Escape Rope @@ -5373,8 +5373,8 @@ Pocket = 7 Price = 100 FieldUse = OnPokemon BattleUse = OnPokemon -Consumable = false Flags = Fling_30 +Consumable = false Description = A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep. #------------------------------- [YELLOWFLUTE] @@ -5383,8 +5383,8 @@ NamePlural = Yellow Flutes Pocket = 7 Price = 300 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A yellow flute made from blown glass. Its melody snaps a single Pokémon out of confusion. #------------------------------- [REDFLUTE] @@ -5393,8 +5393,8 @@ NamePlural = Red Flutes Pocket = 7 Price = 200 BattleUse = OnBattler -Consumable = false Flags = Fling_30 +Consumable = false Description = A red flute made from blown glass. Its melody snaps a single Pokémon out of infatuation. #------------------------------- [POKEDOLL] diff --git a/PBS/Gen 7/pokemon.txt b/PBS/Gen 7/pokemon.txt index 21a9577c6..ec7488714 100644 --- a/PBS/Gen 7/pokemon.txt +++ b/PBS/Gen 7/pokemon.txt @@ -5280,6 +5280,7 @@ Evolutions = MISMAGIUS,Item,DUSKSTONE #------------------------------- [UNOWN] Name = Unown +FormName = A Types = PSYCHIC BaseStats = 48,72,48,48,72,48 GenderRatio = Genderless @@ -5300,7 +5301,6 @@ Shape = Head Habitat = Rare Category = Symbol Pokedex = This Pokémon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown. -FormName = A Generation = 2 #------------------------------- [WOBBUFFET] @@ -9243,6 +9243,7 @@ Generation = 3 #------------------------------- [CASTFORM] Name = Castform +FormName = Normal Form Types = NORMAL BaseStats = 70,70,70,70,70,70 GenderRatio = Female50Percent @@ -9264,7 +9265,6 @@ Shape = Head Habitat = Grassland Category = Weather Pokedex = It alters its form depending on the weather. Changes in the climate such as the temperature and humidity appear to affect its cellular structure. -FormName = Normal Form Generation = 3 WildItemCommon = MYSTICWATER WildItemUncommon = MYSTICWATER @@ -10170,6 +10170,7 @@ WildItemRare = STARPIECE #------------------------------- [DEOXYS] Name = Deoxys +FormName = Normal Forme Types = PSYCHIC BaseStats = 50,150,50,150,150,50 GenderRatio = Genderless @@ -10190,7 +10191,6 @@ Shape = Bipedal Habitat = Rare Category = DNA Pokedex = A Pokémon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed. -FormName = Normal Forme Generation = 3 Flags = Mythical #------------------------------- @@ -10825,6 +10825,7 @@ Generation = 4 #------------------------------- [BURMY] Name = Burmy +FormName = Plant Cloak Types = BUG BaseStats = 40,29,45,36,29,45 GenderRatio = Female50Percent @@ -10845,13 +10846,13 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20 #------------------------------- [WORMADAM] Name = Wormadam +FormName = Plant Cloak Types = BUG,GRASS BaseStats = 60,59,85,36,79,105 GenderRatio = AlwaysFemale @@ -10872,7 +10873,6 @@ Color = Green Shape = HeadBase Category = Bagworm Pokedex = When Burmy evolved, its cloak became a part of this Pokémon's body. The cloak is never shed. -FormName = Plant Cloak Generation = 4 Flags = InheritFormFromMother WildItemUncommon = SILVERPOWDER @@ -11057,6 +11057,7 @@ Evolutions = CHERRIM,Level,25 #------------------------------- [CHERRIM] Name = Cherrim +FormName = Overcast Form Types = GRASS BaseStats = 70,60,70,85,87,78 GenderRatio = Female50Percent @@ -11076,12 +11077,12 @@ Color = Purple Shape = HeadLegs Category = Blossom Pokedex = It blooms during times of strong sunlight. It tries to make up for everything it endured as a bud. -FormName = Overcast Form Generation = 4 WildItemUncommon = MIRACLESEED #------------------------------- [SHELLOS] Name = Shellos +FormName = West Sea Types = WATER BaseStats = 76,48,48,34,57,62 GenderRatio = Female50Percent @@ -11103,13 +11104,13 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother Evolutions = GASTRODON,Level,30 #------------------------------- [GASTRODON] Name = Gastrodon +FormName = West Sea Types = WATER,GROUND BaseStats = 111,83,68,39,92,82 GenderRatio = Female50Percent @@ -11130,7 +11131,6 @@ Color = Purple Shape = Serpentine Category = Sea Slug Pokedex = It has a pliable body without any bones. If any part of its body is torn off, it grows right back. -FormName = West Sea Generation = 4 Flags = InheritFormFromMother #------------------------------- @@ -12520,6 +12520,7 @@ Generation = 4 #------------------------------- [ROTOM] Name = Rotom +FormName = Rotom Types = ELECTRIC,GHOST BaseStats = 50,50,77,91,95,77 GenderRatio = Genderless @@ -12539,7 +12540,6 @@ Color = Red Shape = Head Category = Plasma Pokedex = Its body is composed of plasma. It is known to infiltrate electronic devices and wreak havoc. -FormName = Rotom Generation = 4 #------------------------------- [UXIE] @@ -12715,6 +12715,7 @@ Flags = Legendary #------------------------------- [GIRATINA] Name = Giratina +FormName = Altered Forme Types = GHOST,DRAGON BaseStats = 150,100,120,90,100,120 GenderRatio = Genderless @@ -12735,7 +12736,6 @@ Color = Black Shape = Multiped Category = Renegade Pokedex = A Pokémon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery. -FormName = Altered Forme Generation = 4 Flags = Legendary #------------------------------- @@ -12838,6 +12838,7 @@ Flags = Mythical #------------------------------- [SHAYMIN] Name = Shaymin +FormName = Land Forme Types = GRASS BaseStats = 100,100,100,100,100,100 GenderRatio = Genderless @@ -12857,7 +12858,6 @@ Color = Green Shape = Quadruped Category = Gratitude Pokedex = It lives in flower patches and avoids detection by curling up to look like a flowering plant. -FormName = Land Forme Generation = 4 Flags = Mythical WildItemCommon = LUMBERRY @@ -12866,6 +12866,7 @@ WildItemRare = LUMBERRY #------------------------------- [ARCEUS] Name = Arceus +FormName = Normal Type Types = NORMAL BaseStats = 120,120,120,120,120,120 GenderRatio = Genderless @@ -12885,7 +12886,6 @@ Color = White Shape = Quadruped Category = Alpha Pokedex = It is described in mythology as the Pokémon that shaped the universe with its 1,000 arms. -FormName = Normal Type Generation = 4 Flags = Mythical #------------------------------- @@ -14308,6 +14308,7 @@ WildItemUncommon = ABSORBBULB #------------------------------- [BASCULIN] Name = Basculin +FormName = Red-Striped Types = WATER BaseStats = 70,92,65,98,80,55 GenderRatio = Female50Percent @@ -14329,7 +14330,6 @@ Color = Green Shape = Finned Category = Hostile Pokedex = Savage, violent Pokémon, red and blue Basculin are always fighting each other over territory. -FormName = Red-Striped Generation = 5 Flags = InheritFormFromMother WildItemUncommon = DEEPSEATOOTH @@ -14440,6 +14440,7 @@ Evolutions = DARMANITAN,Level,35 #------------------------------- [DARMANITAN] Name = Darmanitan +FormName = Standard Mode Types = FIRE BaseStats = 105,140,55,95,30,55 GenderRatio = Female50Percent @@ -14460,7 +14461,6 @@ Color = Red Shape = Quadruped Category = Blazing Pokedex = When weakened in battle, it transforms into a stone statue. Then it sharpens its mind and fights on mentally. -FormName = Standard Mode Generation = 5 #------------------------------- [MARACTUS] @@ -15197,6 +15197,7 @@ WildItemCommon = NEVERMELTICE #------------------------------- [DEERLING] Name = Deerling +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 60,60,50,75,40,50 GenderRatio = Female50Percent @@ -15218,12 +15219,12 @@ Color = Pink Shape = Quadruped Category = Season Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons. -FormName = Spring Form Generation = 5 Evolutions = SAWSBUCK,Level,34 #------------------------------- [SAWSBUCK] Name = Sawsbuck +FormName = Spring Form Types = NORMAL,GRASS BaseStats = 80,100,70,95,60,70 GenderRatio = Female50Percent @@ -15244,7 +15245,6 @@ Color = Brown Shape = Quadruped Category = Season Pokedex = The plants growing on its horns change according to the season. The leaders of the herd possess magnificent horns. -FormName = Spring Form Generation = 5 #------------------------------- [EMOLGA] @@ -16597,6 +16597,7 @@ Flags = Legendary #------------------------------- [TORNADUS] Name = Tornadus +FormName = Incarnate Forme Types = FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16617,12 +16618,12 @@ Color = Green Shape = HeadArms Category = Cyclone Pokedex = Tornadus expels massive energy from its tail, causing severe storms. Its power is great enough to blow houses away. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- [THUNDURUS] Name = Thundurus +FormName = Incarnate Forme Types = ELECTRIC,FLYING BaseStats = 79,115,70,111,125,80 GenderRatio = AlwaysMale @@ -16643,7 +16644,6 @@ Color = Blue Shape = HeadArms Category = Bolt Strike Pokedex = The spikes on its tail discharge immense bolts of lightning. It flies around the Unova region firing off lightning bolts. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16697,6 +16697,7 @@ Flags = Legendary #------------------------------- [LANDORUS] Name = Landorus +FormName = Incarnate Forme Types = GROUND,FLYING BaseStats = 89,125,90,101,115,80 GenderRatio = AlwaysMale @@ -16717,7 +16718,6 @@ Color = Brown Shape = HeadArms Category = Abundance Pokedex = The energy that comes pouring from its tail increases the nutrition in the soil, making crops grow to great size. -FormName = Incarnate Forme Generation = 5 Flags = Legendary #------------------------------- @@ -16747,6 +16747,7 @@ Flags = Legendary #------------------------------- [KELDEO] Name = Keldeo +FormName = Ordinary Form Types = WATER,FIGHTING BaseStats = 91,72,90,108,129,90 GenderRatio = Genderless @@ -16766,12 +16767,12 @@ Color = Yellow Shape = Quadruped Category = Colt Pokedex = It crosses the world, running over the surfaces of oceans and rivers. It appears at scenic waterfronts. -FormName = Ordinary Form Generation = 5 Flags = Mythical #------------------------------- [MELOETTA] Name = Meloetta +FormName = Aria Forme Types = NORMAL,PSYCHIC BaseStats = 100,77,77,90,128,128 GenderRatio = Genderless @@ -16791,7 +16792,6 @@ Color = White Shape = Bipedal Category = Melody Pokedex = Many famous songs have been inspired by the melodies that Meloetta plays. -FormName = Aria Forme Generation = 5 Flags = Mythical WildItemCommon = STARPIECE @@ -16800,6 +16800,7 @@ WildItemRare = STARPIECE #------------------------------- [GENESECT] Name = Genesect +FormName = Normal Types = BUG,STEEL BaseStats = 71,120,95,99,120,95 GenderRatio = Genderless @@ -16819,7 +16820,6 @@ Color = Purple Shape = Bipedal Category = Paleozoic Pokedex = This ancient bug Pokémon was altered by Team Plasma. They upgraded the cannon on its back. -FormName = Normal Generation = 5 Flags = Mythical #------------------------------- @@ -17226,6 +17226,7 @@ Evolutions = VIVILLON,Level,12 #------------------------------- [VIVILLON] Name = Vivillon +FormName = Archipelago Pattern Types = BUG,FLYING BaseStats = 80,52,50,89,90,50 GenderRatio = Female50Percent @@ -17246,7 +17247,6 @@ Color = White Shape = MultiWinged Category = Scale Pokedex = Vivillon with many different patterns are found all over the world. These patterns are affected by the climate of their habitat. -FormName = Archipelago Pattern Generation = 6 #------------------------------- [LITLEO] @@ -17301,6 +17301,7 @@ Generation = 6 #------------------------------- [FLABEBE] Name = Flabébé +FormName = Red Flower Types = FAIRY BaseStats = 44,38,39,42,61,79 GenderRatio = AlwaysFemale @@ -17322,13 +17323,13 @@ Color = White Shape = HeadArms Category = Single Bloom Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother Evolutions = FLOETTE,Level,19 #------------------------------- [FLOETTE] Name = Floette +FormName = Red Flower Types = FAIRY BaseStats = 54,45,47,52,75,98 GenderRatio = AlwaysFemale @@ -17349,13 +17350,13 @@ Color = White Shape = HeadArms Category = Single Bloom Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother Evolutions = FLORGES,Item,SHINYSTONE #------------------------------- [FLORGES] Name = Florges +FormName = Red Flower Types = FAIRY BaseStats = 78,65,68,75,112,154 GenderRatio = AlwaysFemale @@ -17376,7 +17377,6 @@ Color = White Shape = HeadArms Category = Garden Pokedex = It claims exquisite flower gardens as its territory, and it obtains power from basking in the energy emitted by flowering plants. -FormName = Red Flower Generation = 6 Flags = InheritFormFromMother #------------------------------- @@ -17484,6 +17484,7 @@ WildItemUncommon = MENTALHERB #------------------------------- [FURFROU] Name = Furfrou +FormName = Natural Form Types = NORMAL BaseStats = 75,80,60,102,65,90 GenderRatio = Female50Percent @@ -17504,7 +17505,6 @@ Color = White Shape = Quadruped Category = Poodle Pokedex = Trimming its fluffy fur not only makes it more elegant but also increases the swiftness of its movements. -FormName = Natural Form Generation = 6 #------------------------------- [ESPURR] @@ -17535,6 +17535,7 @@ Evolutions = MEOWSTIC,Level,25 #------------------------------- [MEOWSTIC] Name = Meowstic +FormName = Male Types = PSYCHIC BaseStats = 74,48,76,104,83,81 GenderRatio = Female50Percent @@ -17555,7 +17556,6 @@ Color = Blue Shape = BipedalTail Category = Constraint Pokedex = When in danger, it raises its ears and releases enough psychic power to grind a 10-ton truck to dust. -FormName = Male Generation = 6 #------------------------------- [HONEDGE] @@ -17609,6 +17609,7 @@ Evolutions = AEGISLASH,Item,DUSKSTONE #------------------------------- [AEGISLASH] Name = Aegislash +FormName = Shield Forme Types = STEEL,GHOST BaseStats = 60,50,150,60,50,150 GenderRatio = Female50Percent @@ -17628,7 +17629,6 @@ Color = Brown Shape = HeadBase Category = Royal Sword Pokedex = Apparently, it can detect the innate qualities of leadership. According to legend, whoever it recognizes is destined to become king. -FormName = Shield Forme Generation = 6 #------------------------------- [SPRITZEE] @@ -18332,6 +18332,7 @@ Generation = 6 #------------------------------- [PUMPKABOO] Name = Pumpkaboo +FormName = Small Size Types = GHOST,GRASS BaseStats = 44,66,70,56,44,55 GenderRatio = Female50Percent @@ -18352,13 +18353,13 @@ Color = Brown Shape = Head Category = Pumpkin Pokedex = The pumpkin body is inhabited by a spirit trapped in this world. As the sun sets, it becomes restless and active. -FormName = Small Size Generation = 6 Flags = InheritFormFromMother Evolutions = GOURGEIST,Trade, #------------------------------- [GOURGEIST] Name = Gourgeist +FormName = Small Size Types = GHOST,GRASS BaseStats = 55,85,122,99,58,75 GenderRatio = Female50Percent @@ -18378,7 +18379,6 @@ Color = Brown Shape = HeadBase Category = Pumpkin Pokedex = Singing in eerie voices, they wander town streets on the night of the new moon. Anyone who hears their song is cursed. -FormName = Small Size Generation = 6 Flags = InheritFormFromMother #------------------------------- @@ -18484,6 +18484,7 @@ Generation = 6 #------------------------------- [XERNEAS] Name = Xerneas +FormName = Neutral Mode Types = FAIRY BaseStats = 126,131,95,99,131,98 GenderRatio = Genderless @@ -18503,7 +18504,6 @@ Color = Blue Shape = Quadruped Category = Life Pokedex = Legends say it can share eternal life. It slept for a thousand years in the form of a tree before its revival. -FormName = Neutral Mode Generation = 6 Flags = Legendary #------------------------------- @@ -18533,6 +18533,7 @@ Flags = Legendary #------------------------------- [ZYGARDE] Name = Zygarde +FormName = 50% Forme Types = DRAGON,GROUND BaseStats = 108,100,121,95,81,95 GenderRatio = Genderless @@ -18552,7 +18553,6 @@ Color = Green Shape = Serpentine Category = Order Pokedex = It's thought to be monitoring the ecosystem. There are rumors that even greater power lies hidden within it. -FormName = 50% Forme Generation = 6 Flags = Legendary #------------------------------- @@ -18582,6 +18582,7 @@ Flags = Mythical #------------------------------- [HOOPA] Name = Hoopa +FormName = Hoopa Confined Types = PSYCHIC,GHOST BaseStats = 80,110,60,70,150,130 GenderRatio = Genderless @@ -18601,7 +18602,6 @@ Color = Purple Shape = HeadArms Category = Mischief Pokedex = This troublemaker sends anything and everything to faraway places using its loop, which can warp space. -FormName = Hoopa Confined Generation = 6 Flags = Mythical #------------------------------- @@ -19111,6 +19111,7 @@ WildItemUncommon = CHERIBERRY #------------------------------- [ORICORIO] Name = Oricorio +FormName = Baile Style Types = FIRE,FLYING BaseStats = 75,70,70,93,98,70 GenderRatio = Female75Percent @@ -19131,7 +19132,6 @@ Color = Red Shape = Winged Category = Dancing Pokedex = It beats its wings together to create fire. As it moves in the steps of its beautiful dance, it bathes opponents in intense flames. -FormName = Baile Style Generation = 7 Flags = InheritFormFromMother WildItemUncommon = HONEY @@ -19216,6 +19216,7 @@ Evolutions = LYCANROC,Level,25 #------------------------------- [LYCANROC] Name = Lycanroc +FormName = Midday Form Types = ROCK BaseStats = 75,115,65,112,55,65 GenderRatio = Female50Percent @@ -19236,11 +19237,11 @@ Color = Brown Shape = Quadruped Category = Wolf Pokedex = Its quick movements confuse its enemies. Well equipped with claws and fangs, it also uses the sharp rocks in its mane as weapons. -FormName = Midday Form Generation = 7 #------------------------------- [WISHIWASHI] Name = Wishiwashi +FormName = Solo Form Types = WATER BaseStats = 45,20,20,40,25,25 GenderRatio = Female50Percent @@ -19261,7 +19262,6 @@ Color = Blue Shape = Finned Category = Small Fry Pokedex = It's awfully weak and notably tasty, so everyone is always out to get it. As it happens, anyone trying to bully it receives a painful lesson. -FormName = Solo Form Generation = 7 #------------------------------- [MAREANIE] @@ -19934,6 +19934,7 @@ Evolutions = SILVALLY,Happiness, #------------------------------- [SILVALLY] Name = Silvally +FormName = Type: Normal Types = NORMAL BaseStats = 95,95,95,95,95,95 GenderRatio = Genderless @@ -19953,12 +19954,12 @@ Color = Gray Shape = Quadruped Category = Synthetic Pokedex = Its trust in its partner is what awakens it. This Pokémon is capable of changing its type, a flexibility that is well displayed in battle. -FormName = Type: Normal Generation = 7 Flags = Legendary #------------------------------- [MINIOR] Name = Minior +FormName = Meteor Form Types = ROCK,FLYING BaseStats = 60,60,100,60,60,100 GenderRatio = Genderless @@ -19978,7 +19979,6 @@ Color = Brown Shape = Head Category = Meteor Pokedex = Originally making its home in the ozone layer, it hurtles to the ground when the shell enclosing its body grows too heavy. -FormName = Meteor Form Generation = 7 WildItemUncommon = STARPIECE #------------------------------- @@ -20059,6 +20059,7 @@ WildItemUncommon = ELECTRICSEED #------------------------------- [MIMIKYU] Name = Mimikyu +FormName = Disguised Form Types = GHOST,FAIRY BaseStats = 55,90,80,96,50,105 GenderRatio = Female50Percent @@ -20079,7 +20080,6 @@ Color = Yellow Shape = Serpentine Category = Disguise Pokedex = A lonely Pokémon, it conceals its terrifying appearance beneath an old rag so it can get closer to people and other Pokémon. -FormName = Disguised Form Generation = 7 WildItemUncommon = CHESTOBERRY #------------------------------- diff --git a/PBS/Gen 8/abilities.txt b/PBS/Gen 8/abilities.txt index 5af587cb2..d18729217 100644 --- a/PBS/Gen 8/abilities.txt +++ b/PBS/Gen 8/abilities.txt @@ -158,8 +158,8 @@ Description = The Pokémon is protected from flinching. #------------------------------- [MAGMAARMOR] Name = Magma Armor -Flags = FasterEggHatching Description = Prevents the Pokémon from becoming frozen. +Flags = FasterEggHatching #------------------------------- [WATERVEIL] Name = Water Veil @@ -195,8 +195,8 @@ Description = The Pokémon awakens quickly from sleep. #------------------------------- [FLAMEBODY] Name = Flame Body -Flags = FasterEggHatching Description = Contact with the Pokémon may burn the attacker. +Flags = FasterEggHatching #------------------------------- [RUNAWAY] Name = Run Away @@ -972,8 +972,8 @@ Description = This Pokémon's moves cannot be redirected. #------------------------------- [STEAMENGINE] Name = Steam Engine -Flags = FasterEggHatching Description = Boosts Speed drastically if hit by a Fire or Water move. +Flags = FasterEggHatching #------------------------------- [PUNKROCK] Name = Punk Rock @@ -1069,4 +1069,4 @@ Description = Combines Unnerve and Chilling Neigh Abilities. #------------------------------- [ASONEGRIMNEIGH] Name = As One -Description = Combines Unnerve and Grim Neigh Abilities. \ No newline at end of file +Description = Combines Unnerve and Grim Neigh Abilities. diff --git a/PBS/Gen 8/encounters.txt b/PBS/Gen 8/encounters.txt index 821028696..d6659ac63 100644 --- a/PBS/Gen 8/encounters.txt +++ b/PBS/Gen 8/encounters.txt @@ -32,6 +32,8 @@ LandNight,21 9,HOOTHOOT,10,14 1,HOOTHOOT,14 1,RATTATA,15 +PokeRadar,20 + 100,STARLY,12,15 #------------------------------- [005,1] # Route 1 Land,21 @@ -77,6 +79,8 @@ HeadbuttHigh 50,PINECO,11,13 30,WURMPLE,6,8 20,SPINARAK,9,12 +PokeRadar,10 + 100,STANTLER,14 #------------------------------- [028] # Natural Park Land,21 @@ -110,6 +114,9 @@ BugContest,21 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 @@ -185,7 +192,7 @@ RockSmash,50 90,NOSEPASS,13,14 10,GEODUDE,12,15 #------------------------------- -[049] # Rock Cave +[049] # Rock Cave 1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -194,7 +201,7 @@ Cave,5 10,GEODUDE,13,15 10,MAWILE,14,16 #------------------------------- -[050] # Rock Cave +[050] # Rock Cave B1F Cave,5 20,MAGNETON,14,16 20,MAGNETON,14,17 @@ -212,7 +219,7 @@ Cave,5 10,RIOLU,1 10,TYROGUE,1 #------------------------------- -[066] # Safari Zone +[066] # Safari Zone outside Land,21 20,ABRA,12,15 20,DODUO,13,15 @@ -282,7 +289,7 @@ SuperRod 15,CORSOLA,15,18 5,STARYU,15,17 #------------------------------- -[070] # Underwater +[070] # Route 8 underwater Land,21 20,CHINCHOU,17,21 20,CLAMPERL,18,20 diff --git a/PBS/Gen 8/items.txt b/PBS/Gen 8/items.txt index a2e945334..fb9f93285 100644 --- a/PBS/Gen 8/items.txt +++ b/PBS/Gen 8/items.txt @@ -2511,8 +2511,8 @@ Description = One of a variety of mysterious Mega Stones. Have Venusaur hold it, Name = Charizardite X NamePlural = Charizardite Xs Pocket = 1 -BPPrice = 50 Price = 0 +BPPrice = 50 Flags = MegaStone,Fling_80 Description = One of a variety of mysterious Mega Stones. Have Charizard hold it, and it will be able to Mega Evolve. #------------------------------- diff --git a/PBS/Gen 8/pokemon.txt b/PBS/Gen 8/pokemon.txt index c0914066c..451a11c0b 100644 --- a/PBS/Gen 8/pokemon.txt +++ b/PBS/Gen 8/pokemon.txt @@ -2170,7 +2170,7 @@ Category = Magnet Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius. Generation = 1 WildItemUncommon = METALCOAT -Evolutions = MAGNEZONE,LocationFlag,Magnetic,MAGNEZONE,Item,THUNDERSTONE +Evolutions = MAGNEZONE,Item,THUNDERSTONE,MAGNEZONE,LocationFlag,Magnetic #------------------------------- [FARFETCHD] Name = Farfetch'd @@ -3525,7 +3525,7 @@ Habitat = Urban Category = Evolution Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve. Generation = 1 -Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,LocationFlag,MossRock,LEAFEON,Item,LEAFSTONE,GLACEON,LocationFlag,IceRock,GLACEON,Item,ICESTONE,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight, +Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,Item,LEAFSTONE,LEAFEON,LocationFlag,MossRock,GLACEON,Item,ICESTONE,GLACEON,LocationFlag,IceRock,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight, #------------------------------- [VAPOREON] Name = Vaporeon @@ -9220,7 +9220,7 @@ Habitat = WatersEdge Category = Fish Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it. Generation = 3 -Evolutions = MILOTIC,Beauty,170,MILOTIC,TradeItem,PRISMSCALE +Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170 #------------------------------- [MILOTIC] Name = Milotic @@ -19038,7 +19038,7 @@ Category = Battery Pokedex = It buries itself in fallen leaves and barely moves, munching away on humus. If you accidentally step on one, you'll get a shock! Generation = 7 WildItemUncommon = CELLBATTERY -Evolutions = VIKAVOLT,LocationFlag,Magnetic,VIKAVOLT,Item,THUNDERSTONE +Evolutions = VIKAVOLT,Item,THUNDERSTONE,VIKAVOLT,LocationFlag,Magnetic #------------------------------- [VIKAVOLT] Name = Vikavolt