DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 06:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maruno17
2021-09-02 22:01:17 +01:00
parent 885c1193e3
commit 423961e524
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
View File

@@ -205,6 +205,7 @@ def pbDayCareGenerateEgg
egg.form = parent.form egg.form = parent.form
break break
end end
egg.form = 0 if babyspecies == :SINISTEA
# Inheriting Moves # Inheriting Moves
moves = [] moves = []
othermoves = [] othermoves = []

12
PBS/Gen 8/pokemon.txt
View File

@@ -27674,7 +27674,7 @@ Shape = BipedalTail
Category = Blocking Category = Blocking
Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27706,7 +27706,7 @@ Shape = BipedalTail
Category = Viking Category = Viking
Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle.
Generation = 8 Generation = 8
Flags = DefaultForm2 Flags = DefaultForm2,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27738,7 +27738,7 @@ Shape = HeadArms
Category = Coral Category = Coral
Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27770,7 +27770,7 @@ Shape = Winged
Category = Wild Duck 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. 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 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
WildItemUncommon = LEEK WildItemUncommon = LEEK
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
@@ -27804,7 +27804,7 @@ Shape = Bipedal
Category = Comedian Category = Comedian
Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27836,7 +27836,7 @@ Shape = HeadBase
Category = Grudge Category = Grudge
Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0

12
PBS/pokemon.txt
View File

@@ -27674,7 +27674,7 @@ Shape = BipedalTail
Category = Blocking Category = Blocking
Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch. Pokedex = It evolved after experiencing numerous fights. While crossing its arms, it lets out a shout that would make any opponent flinch.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27706,7 +27706,7 @@ Shape = BipedalTail
Category = Viking Category = Viking
Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle. Pokedex = What appears to be an iron helmet is actually hardened hair. This Pokémon lives for the thrill of battle.
Generation = 8 Generation = 8
Flags = DefaultForm2 Flags = DefaultForm2,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27738,7 +27738,7 @@ Shape = HeadArms
Category = Coral Category = Coral
Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit. Pokedex = Its shell is overflowing with its heightened otherworldly energy. The ectoplasm serves as protection for this Pokémon's core spirit.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27770,7 +27770,7 @@ Shape = Winged
Category = Wild Duck 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. 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 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
WildItemUncommon = LEEK WildItemUncommon = LEEK
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
@@ -27804,7 +27804,7 @@ Shape = Bipedal
Category = Comedian Category = Comedian
Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly. Pokedex = Its amusing movements make it very popular. It releases its psychic power from the pattern on its belly.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -27836,7 +27836,7 @@ Shape = HeadBase
Category = Grudge Category = Grudge
Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move. Pokedex = A powerful curse was woven into an ancient painting. After absorbing the spirit of a Yamask, the painting began to move.
Generation = 8 Generation = 8
Flags = DefaultForm1 Flags = DefaultForm1,InheritFormWithEverStone
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0