mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
Fixed error when shifting Pokémon at the end of a battle round, fixed Giratina's form code crashing if the current map doesn't have metadata, fixed item sell prices being halved twice
This commit is contained in:
@@ -579,7 +579,7 @@ class Battle
|
||||
swaps.each do |pair|
|
||||
next if pbSideSize(pair[0]) == 2 && swaps.length > 1
|
||||
next if !pbSwapBattlers(pair[0], pair[1])
|
||||
case pbSideSize(side)
|
||||
case pbSideSize(pair[1])
|
||||
when 2
|
||||
pbDisplay(_INTL("{1} moved across!", @battlers[pair[1]].pbThis))
|
||||
when 3
|
||||
|
||||
@@ -260,8 +260,7 @@ MultipleForms.register(:ROTOM, {
|
||||
MultipleForms.register(:GIRATINA, {
|
||||
"getForm" => proc { |pkmn|
|
||||
next 1 if pkmn.hasItem?(:GRISEOUSORB)
|
||||
if $game_map &&
|
||||
GameData::MapMetadata.get($game_map.map_id)&.has_flag?("DistortionWorld")
|
||||
if $game_map && $game_map.metadata&.has_flag?("DistortionWorld")
|
||||
next 1
|
||||
end
|
||||
next 0
|
||||
|
||||
@@ -460,7 +460,6 @@ class PokemonMart_Scene
|
||||
ret = 0
|
||||
helpwindow = @sprites["helpwindow"]
|
||||
itemprice = @adapter.getPrice(item, !@buying)
|
||||
itemprice /= 2 if !@buying
|
||||
pbDisplay(helptext, true)
|
||||
using(numwindow = Window_AdvancedTextPokemon.new("")) do # Showing number of items
|
||||
pbPrepareWindow(numwindow)
|
||||
@@ -681,7 +680,6 @@ class PokemonMartScreen
|
||||
@scene.pbHideMoney
|
||||
next
|
||||
end
|
||||
price /= 2
|
||||
price *= qty
|
||||
if pbConfirm(_INTL("I can pay ${1}.\nWould that be OK?", price.to_s_formatted))
|
||||
old_money = @adapter.getMoney
|
||||
|
||||
Reference in New Issue
Block a user