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

Tiny Bugfixes (#161)

Browse Source 
* Removed extra confirm sfx in mart screen
* Fixed Calyrex keeping its form exclusive moves
* Fixed some methods being aliased multiple times upon soft resetting
This commit is contained in:
Golisopod-User
2022-01-21 03:32:22 +05:30
committed by GitHub
parent a0d951edf7
commit b980d8505c
7 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
View File

@@ -710,11 +710,23 @@ MultipleForms.register(:CALYREX, {
:ASTRALBARRAGE # Shadow Rider (with Spectrier) (form 2)
]
if form == 0 # Normal
# Forget special form moves
form_moves.each do |move|
next if !pkmn.hasMove?(move)
pkmn.forget_move(move)
pbMessage(_INTL("{1} forgot {2}...", pkmn.name, GameData::Move.get(move).name))
end
# Forget all other moves not accessible to the base form
sp_data = pkmn.species_data
pkmn.moves.each_with_index do |move, i|
next if sp_data.moves.any? { |learn_move| learn_move[1] == move.id }
next if sp_data.tutor_moves.include?(move.id)
next if sp_data.egg_moves.include?(move.id)
pbMessage(_INTL("{1} forgot {2}...", pkmn.name, move.name))
pkmn.moves[i] = nil
end
pkmn.moves.compact!
# Ensure pkmn has at least one move in the end
pbLearnMove(pkmn, :CONFUSION) if pkmn.numMoves == 0
else # Ice Rider, Shadow Rider
new_move = form_moves[form - 1]