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

Fixed party screen not animating while teaching a machine move

Browse Source
This commit is contained in:
Maruno17
2020-09-12 01:39:31 +01:00
parent e5139b4d57
commit a756539651
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb
View File

@@ -1025,24 +1025,21 @@ def pbMoveTutorChoose(move,movelist=nil,bymachine=false)
screen.pbStartScene(_INTL("Teach which Pokémon?"),false,annot)
loop do
chosen = screen.pbChoosePokemon
if chosen>=0
pokemon = $Trainer.party[chosen]
if pokemon.egg?
pbMessage(_INTL("Eggs can't be taught any moves."))
elsif pokemon.shadowPokemon?
pbMessage(_INTL("Shadow Pokémon can't be taught any moves."))
elsif movelist && !movelist.any? { |j| j==pokemon.species }
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename))
elsif !pokemon.compatibleWithMove?(move)
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename))
else
if pbLearnMove(pokemon,move,false,bymachine)
ret = true
break
end
end
break if chosen<0
pokemon = $Trainer.party[chosen]
if pokemon.egg?
pbMessage(_INTL("Eggs can't be taught any moves.")) { screen.pbUpdate }
elsif pokemon.shadowPokemon?
pbMessage(_INTL("Shadow Pokémon can't be taught any moves.")) { screen.pbUpdate }
elsif movelist && !movelist.any? { |j| j==pokemon.species }
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) { screen.pbUpdate }
elsif !pokemon.compatibleWithMove?(move)
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) { screen.pbUpdate }
else
break
if pbLearnMove(pokemon,move,false,bymachine) { screen.pbUpdate }
ret = true
break
end
end
end
screen.pbEndScene