Split PokeBattle_Trainer into PlayerTrainer and NPCTrainer

This commit is contained in:
Maruno17
2021-01-24 17:55:39 +00:00
parent 7de034957b
commit 4098b1cd11
60 changed files with 748 additions and 648 deletions

View File

@@ -191,7 +191,7 @@ class PokeBattle_Battler
def owned?
return false if !@battle.wildBattle?
return $Trainer.owned[displaySpecies]
return $Trainer.owned?(displaySpecies)
end
alias owned owned?
@@ -259,7 +259,7 @@ class PokeBattle_Battler
end
# Badge multiplier
if @battle.internalBattle && pbOwnedByPlayer? &&
@battle.pbPlayer.numbadges>=NUM_BADGES_BOOST_SPEED
@battle.pbPlayer.badge_count >= NUM_BADGES_BOOST_SPEED
speedMult *= 1.1
end
# Calculation