From 423961e52407a36d671e83b3ed157280ef893b62 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 2 Sep 2021 22:01:17 +0100 Subject: [PATCH] Fixed unique Galarian evolutions not being flagged as being able to pass their form on when breeding, fixed bred Sinistea sometimes not being phony form --- Data/Scripts/012_Overworld/007_Overworld_DayCare.rb | 1 + PBS/Gen 8/pokemon.txt | 12 ++++++------ PBS/pokemon.txt | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb index 63c99290e..e0f35dea5 100644 --- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb +++ b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb @@ -205,6 +205,7 @@ def pbDayCareGenerateEgg egg.form = parent.form break end + egg.form = 0 if babyspecies == :SINISTEA # Inheriting Moves moves = [] othermoves = [] diff --git a/PBS/Gen 8/pokemon.txt b/PBS/Gen 8/pokemon.txt index 24b4985e3..c568e4ceb 100644 --- a/PBS/Gen 8/pokemon.txt +++ b/PBS/Gen 8/pokemon.txt @@ -27674,7 +27674,7 @@ Shape = BipedalTail Category = Blocking Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27706,7 +27706,7 @@ Shape = BipedalTail Category = Viking Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Generation = 8 -Flags = DefaultForm2 +Flags = DefaultForm2,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27738,7 +27738,7 @@ Shape = HeadArms Category = Coral Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27770,7 +27770,7 @@ Shape = Winged Category = Wild Duck Pokedex = After deflecting attacks with its hard leaf shield, it strikes back with its sharp leek stalk. The leek stalk is both weapon and food. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone WildItemUncommon = LEEK BattlerPlayerX = 0 BattlerPlayerY = 0 @@ -27804,7 +27804,7 @@ Shape = Bipedal Category = Comedian Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27836,7 +27836,7 @@ Shape = HeadBase Category = Grudge Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 diff --git a/PBS/pokemon.txt b/PBS/pokemon.txt index 24b4985e3..c568e4ceb 100644 --- a/PBS/pokemon.txt +++ b/PBS/pokemon.txt @@ -27674,7 +27674,7 @@ Shape = BipedalTail Category = Blocking Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27706,7 +27706,7 @@ Shape = BipedalTail Category = Viking Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Generation = 8 -Flags = DefaultForm2 +Flags = DefaultForm2,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27738,7 +27738,7 @@ Shape = HeadArms Category = Coral Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27770,7 +27770,7 @@ Shape = Winged Category = Wild Duck Pokedex = After deflecting attacks with its hard leaf shield, it strikes back with its sharp leek stalk. The leek stalk is both weapon and food. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone WildItemUncommon = LEEK BattlerPlayerX = 0 BattlerPlayerY = 0 @@ -27804,7 +27804,7 @@ Shape = Bipedal Category = Comedian Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0 @@ -27836,7 +27836,7 @@ Shape = HeadBase Category = Grudge Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Generation = 8 -Flags = DefaultForm1 +Flags = DefaultForm1,InheritFormWithEverStone BattlerPlayerX = 0 BattlerPlayerY = 0 BattlerEnemyX = 0