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

Pokémon in storage no longer recalculate their form

Browse Source
This commit is contained in:
Maruno17
2021-08-30 00:10:31 +01:00
parent 70ef588190
commit c92bb2fb42
6 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -539,6 +539,7 @@ class PokemonBoxPartySprite < SpriteWrapper
yvalues.push(2 + 16 * (i % 2) + 64 * (i / 2))
end
@pokemonsprites.delete_if { |sprite| sprite && sprite.disposed? }
@pokemonsprites.each { |sprite| sprite.refresh if sprite }
for j in 0...Settings::MAX_PARTY_SIZE
sprite = @pokemonsprites[j]
if sprite && !sprite.disposed?
@@ -1478,6 +1479,7 @@ class PokemonStorageScreen
end
def pbStartScreen(command)
$game_temp.in_storage = true
@heldpkmn = nil
if command==0 # Organise
@scene.pbStartBox(self,command)
@@ -1636,6 +1638,7 @@ class PokemonStorageScreen
@scene.pbStartBox(self,command)
@scene.pbCloseBox
end
$game_temp.in_storage = false
end
def pbUpdate # For debug
@@ -1724,8 +1727,6 @@ class PokemonStorageScreen
end
if heldpoke || selected[0]==-1
p = (heldpoke) ? heldpoke : @storage[-1,index]
p.time_form_set = nil
p.form = 0 if p.isSpecies?(:SHAYMIN)
p.heal if Settings::HEAL_STORED_POKEMON
end
@scene.pbStore(selected,heldpoke,destbox,firstfree)
@@ -1770,11 +1771,7 @@ class PokemonStorageScreen
pbDisplay("Please remove the mail.")
return
end
if box>=0
@heldpkmn.time_form_set = nil
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON
end
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON if box >= 0
@scene.pbPlace(selected,@heldpkmn)
@storage[box,index] = @heldpkmn
if box==-1
@@ -1799,11 +1796,7 @@ class PokemonStorageScreen
pbDisplay("Please remove the mail.")
return false
end
if box>=0
@heldpkmn.time_form_set = nil
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON
end
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON if box >= 0
@scene.pbSwap(selected,@heldpkmn)
tmp = @storage[box,index]
@storage[box,index] = @heldpkmn
@@ -1934,6 +1927,7 @@ class PokemonStorageScreen
end
def pbChoosePokemon(_party=nil)
$game_temp.in_storage = true
@heldpkmn = nil
@scene.pbStartBox(self,1)
retval = nil
@@ -1987,6 +1981,7 @@ class PokemonStorageScreen
end
end
@scene.pbCloseBox
$game_temp.in_storage = false
return retval
end
end