Fixed moves taught via battle Debug menu not working, fixed Max Mushrooms showing the stat up animation for every stat

This commit is contained in:
Maruno17
2022-04-24 21:06:40 +01:00
parent ad29dc6dc4
commit fd5d3e332d
2 changed files with 7 additions and 6 deletions

View File

@@ -673,11 +673,12 @@ ItemHandlers::BattleUseOnBattler.add(:XACCURACY6, proc { |item, battler, scene|
})
ItemHandlers::BattleUseOnBattler.add(:MAXMUSHROOMS, proc { |item, battler, scene|
battler.pbRaiseStatStage(:ATTACK, 1, battler) if battler.pbCanRaiseStatStage?(:ATTACK, battler)
battler.pbRaiseStatStage(:DEFENSE, 1, battler) if battler.pbCanRaiseStatStage?(:DEFENSE, battler)
battler.pbRaiseStatStage(:SPECIAL_ATTACK, 1, battler) if battler.pbCanRaiseStatStage?(:SPECIAL_ATTACK, battler)
battler.pbRaiseStatStage(:SPECIAL_DEFENSE, 1, battler) if battler.pbCanRaiseStatStage?(:SPECIAL_DEFENSE, battler)
battler.pbRaiseStatStage(:SPEED, 1, battler) if battler.pbCanRaiseStatStage?(:SPEED, battler)
show_anim = true
GameData::Stat.each_main_battle do |stat|
next if !battler.pbCanRaiseStatStage?(stat.id, battler)
battler.pbRaiseStatStage(stat.id, 1, battler, show_anim)
show_anim = false
end
battler.pokemon.changeHappiness("battleitem")
})

View File

@@ -484,7 +484,7 @@ MenuHandlers.add(:battle_pokemon_debug_menu, :teach_move, {
next
end
pkmn.learn_move(new_move)
battler&.moves&.push(Battle::Move.from_pokemon_move(self, pkmn.moves.last))
battler&.moves&.push(Battle::Move.from_pokemon_move(battle, pkmn.moves.last))
pbMessage("\\ts[]" + _INTL("{1} learned {2}!", pkmn.name, move_name))
}
})