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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2020-11-25 22:07:17 +00:00
parent bba24abc1a e2dcba2169
commit 017cdb8d0f
14 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb
View File

@@ -163,7 +163,7 @@ def pbGetBabySpecies(species, check_items = false, item1 = nil, item2 = nil)
end
break
end
ret = pbGetBabySpecies(ret) if ret != species
ret = pbGetBabySpecies(ret, item1, item2) if ret != species
return ret
end