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

Merge branch 'pr/43' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-17 14:40:52 +01:00
parent 7640736188 47a1cb5462
commit a6d21de0c1
18 changed files with 201 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/013_Overworld/002_PField_Field.rb
View File

@@ -882,8 +882,7 @@ def pbRegisterPartner(trainerid,trainername,partyid=0)
trainerobject = PokeBattle_Trainer.new(_INTL(trainer[0].name),trainerid)
trainerobject.setForeignID($Trainer)
for i in trainer[2]
i.trainerID = trainerobject.id
i.ot = trainerobject.name
i.owner = Pokemon::Owner.new_from_trainer(trainerobject)
i.calcStats
end
$PokemonGlobal.partner = [trainerid,trainerobject.name,trainerobject.id,trainer[2]]