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

Fixed Xerneas/Zacian/Zamazenta not being their alternate form throughout battle

Browse Source
This commit is contained in:
Maruno17
2022-05-29 18:13:08 +01:00
parent 9ecbee910d
commit 6a046ff755
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb
View File

@@ -258,6 +258,8 @@ class Battle
logMsg += "#{@opponent.length} trainer(s))" if trainerBattle?
PBDebug.log(logMsg)
pbEnsureParticipants
pbParty(0).each { |pkmn| @peer.pbOnStartingBattle(self, pkmn, wildBattle?) if pkmn }
pbParty(1).each { |pkmn| @peer.pbOnStartingBattle(self, pkmn, wildBattle?) if pkmn }
begin
pbStartBattleCore
rescue BattleAbortedException

6
Data/Scripts/011_Battle/006_Other battle code/004_Battle_Peers.rb
View File

@@ -36,6 +36,12 @@ class Battle::Peer
return (box < 0) ? "" : $PokemonStorage[box].name
end
def pbOnStartingBattle(battle, pkmn, wild = false)
f = MultipleForms.call("getFormOnStartingBattle", pkmn, wild)
pkmn.form = f if f
MultipleForms.call("changePokemonOnStartingBattle", pkmn, battle)
end
def pbOnEnteringBattle(battle, battler, pkmn, wild = false)
f = MultipleForms.call("getFormOnEnteringBattle", pkmn, wild)
pkmn.form = f if f