Fixed Pokédex searches not considering the properties of alternate forms, fixed RMXP-style battle transitions not working, tweaked form-inheriting code in breeding

This commit is contained in:
Maruno17
2021-08-22 00:00:51 +01:00
parent 4b768bec32
commit e0e5cfebb7
3 changed files with 8 additions and 6 deletions

View File

@@ -88,8 +88,8 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil)
end
# Play main animation
Graphics.freeze
Graphics.transition(Graphics.frame_rate*1.25,sprintf("Graphics/Transitions/%s",anim))
viewport.color = Color.new(0,0,0,255) # Ensure screen is black
Graphics.transition(Graphics.frame_rate*1.25,sprintf("Graphics/Transitions/%s",anim))
# Slight pause after animation before starting up the battle scene
(Graphics.frame_rate/10).times do
Graphics.update

View File

@@ -193,8 +193,9 @@ def pbDayCareGenerateEgg
egg.personalID = pid
# Inheriting form
if [:BURMY, :SHELLOS, :BASCULIN, :FLABEBE, :PUMPKABOO, :ORICORIO, :ROCKRUFF, :MINIOR].include?(babyspecies)
newForm = mother.form
newForm = 0 if mother.isSpecies?(:MOTHIM)
parent = (ditto0 || (!pkmn0.female? && ditto1)) ? father : mother
newForm = parent.form
newForm = 0 if parent.isSpecies?(:MOTHIM)
egg.form = newForm
end
# Inheriting Alolan form