From f10fe5c491e7d6d0068f63d895ac09c1023a7a54 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 17 Apr 2021 23:56:51 +0100 Subject: [PATCH] Minor fixes for previous commit --- Data/Scripts/002_Save data/005_Game_SaveConversions.rb | 4 +++- Data/Scripts/{014_Items => 013_Items}/001_Item_Utilities.rb | 0 Data/Scripts/{014_Items => 013_Items}/002_Item_Effects.rb | 0 .../{014_Items => 013_Items}/003_Item_BattleEffects.rb | 0 Data/Scripts/{014_Items => 013_Items}/004_Item_Phone.rb | 0 Data/Scripts/{014_Items => 013_Items}/005_Item_PokeRadar.rb | 0 Data/Scripts/{014_Items => 013_Items}/006_Item_Mail.rb | 0 Data/Scripts/{014_Items => 013_Items}/007_Item_Sprites.rb | 0 Data/Scripts/{014_Items => 013_Items}/008_PokemonBag.rb | 0 .../001_Pokemon-related/001_FormHandlers.rb | 0 .../001_Pokemon-related/002_ShadowPokemon_Other.rb | 0 .../001_Pokemon-related/003_Pokemon_Sprites.rb | 0 .../001_Pokemon-related/004_PokemonStorage.rb | 0 Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon.rb | 0 .../{013_Pokemon => 014_Pokemon}/002_Pokemon_MegaEvolution.rb | 0 .../{013_Pokemon => 014_Pokemon}/003_Pokemon_ShadowPokemon.rb | 0 Data/Scripts/{013_Pokemon => 014_Pokemon}/004_Pokemon_Move.rb | 0 .../Scripts/{013_Pokemon => 014_Pokemon}/005_Pokemon_Owner.rb | 0 .../{013_Pokemon => 014_Pokemon}/006_Pokemon_Deprecated.rb | 0 Data/Scripts/016_UI/022_UI_PurifyChamber.rb | 4 ++-- 20 files changed, 5 insertions(+), 3 deletions(-) rename Data/Scripts/{014_Items => 013_Items}/001_Item_Utilities.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/002_Item_Effects.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/003_Item_BattleEffects.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/004_Item_Phone.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/005_Item_PokeRadar.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/006_Item_Mail.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/007_Item_Sprites.rb (100%) rename Data/Scripts/{014_Items => 013_Items}/008_PokemonBag.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon-related/001_FormHandlers.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon-related/002_ShadowPokemon_Other.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon-related/003_Pokemon_Sprites.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon-related/004_PokemonStorage.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/001_Pokemon.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/002_Pokemon_MegaEvolution.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/003_Pokemon_ShadowPokemon.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/004_Pokemon_Move.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/005_Pokemon_Owner.rb (100%) rename Data/Scripts/{013_Pokemon => 014_Pokemon}/006_Pokemon_Deprecated.rb (100%) diff --git a/Data/Scripts/002_Save data/005_Game_SaveConversions.rb b/Data/Scripts/002_Save data/005_Game_SaveConversions.rb index 913aac0b7..c066d83d0 100644 --- a/Data/Scripts/002_Save data/005_Game_SaveConversions.rb +++ b/Data/Scripts/002_Save data/005_Game_SaveConversions.rb @@ -178,7 +178,9 @@ SaveData.register_conversion(:v19_convert_game_variables) do display_title 'Converting classes of things in Game Variables' to_all do |save_data| variables = save_data[:variables] - variables.each_with_index do |value, i| + for i in 0..5000 + value = variables[i] + next if value.nil? if value.is_a?(Array) value.each_with_index do |value2, j| if value2.is_a?(PokeBattle_Pokemon) diff --git a/Data/Scripts/014_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb similarity index 100% rename from Data/Scripts/014_Items/001_Item_Utilities.rb rename to Data/Scripts/013_Items/001_Item_Utilities.rb diff --git a/Data/Scripts/014_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb similarity index 100% rename from Data/Scripts/014_Items/002_Item_Effects.rb rename to Data/Scripts/013_Items/002_Item_Effects.rb diff --git a/Data/Scripts/014_Items/003_Item_BattleEffects.rb b/Data/Scripts/013_Items/003_Item_BattleEffects.rb similarity index 100% rename from Data/Scripts/014_Items/003_Item_BattleEffects.rb rename to Data/Scripts/013_Items/003_Item_BattleEffects.rb diff --git a/Data/Scripts/014_Items/004_Item_Phone.rb b/Data/Scripts/013_Items/004_Item_Phone.rb similarity index 100% rename from Data/Scripts/014_Items/004_Item_Phone.rb rename to Data/Scripts/013_Items/004_Item_Phone.rb diff --git a/Data/Scripts/014_Items/005_Item_PokeRadar.rb b/Data/Scripts/013_Items/005_Item_PokeRadar.rb similarity index 100% rename from Data/Scripts/014_Items/005_Item_PokeRadar.rb rename to Data/Scripts/013_Items/005_Item_PokeRadar.rb diff --git a/Data/Scripts/014_Items/006_Item_Mail.rb b/Data/Scripts/013_Items/006_Item_Mail.rb similarity index 100% rename from Data/Scripts/014_Items/006_Item_Mail.rb rename to Data/Scripts/013_Items/006_Item_Mail.rb diff --git a/Data/Scripts/014_Items/007_Item_Sprites.rb b/Data/Scripts/013_Items/007_Item_Sprites.rb similarity index 100% rename from Data/Scripts/014_Items/007_Item_Sprites.rb rename to Data/Scripts/013_Items/007_Item_Sprites.rb diff --git a/Data/Scripts/014_Items/008_PokemonBag.rb b/Data/Scripts/013_Items/008_PokemonBag.rb similarity index 100% rename from Data/Scripts/014_Items/008_PokemonBag.rb rename to Data/Scripts/013_Items/008_PokemonBag.rb diff --git a/Data/Scripts/013_Pokemon/001_Pokemon-related/001_FormHandlers.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb similarity index 100% rename from Data/Scripts/013_Pokemon/001_Pokemon-related/001_FormHandlers.rb rename to Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb diff --git a/Data/Scripts/013_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb similarity index 100% rename from Data/Scripts/013_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb rename to Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb diff --git a/Data/Scripts/013_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb similarity index 100% rename from Data/Scripts/013_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb rename to Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb diff --git a/Data/Scripts/013_Pokemon/001_Pokemon-related/004_PokemonStorage.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb similarity index 100% rename from Data/Scripts/013_Pokemon/001_Pokemon-related/004_PokemonStorage.rb rename to Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb diff --git a/Data/Scripts/013_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb similarity index 100% rename from Data/Scripts/013_Pokemon/001_Pokemon.rb rename to Data/Scripts/014_Pokemon/001_Pokemon.rb diff --git a/Data/Scripts/013_Pokemon/002_Pokemon_MegaEvolution.rb b/Data/Scripts/014_Pokemon/002_Pokemon_MegaEvolution.rb similarity index 100% rename from Data/Scripts/013_Pokemon/002_Pokemon_MegaEvolution.rb rename to Data/Scripts/014_Pokemon/002_Pokemon_MegaEvolution.rb diff --git a/Data/Scripts/013_Pokemon/003_Pokemon_ShadowPokemon.rb b/Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb similarity index 100% rename from Data/Scripts/013_Pokemon/003_Pokemon_ShadowPokemon.rb rename to Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb diff --git a/Data/Scripts/013_Pokemon/004_Pokemon_Move.rb b/Data/Scripts/014_Pokemon/004_Pokemon_Move.rb similarity index 100% rename from Data/Scripts/013_Pokemon/004_Pokemon_Move.rb rename to Data/Scripts/014_Pokemon/004_Pokemon_Move.rb diff --git a/Data/Scripts/013_Pokemon/005_Pokemon_Owner.rb b/Data/Scripts/014_Pokemon/005_Pokemon_Owner.rb similarity index 100% rename from Data/Scripts/013_Pokemon/005_Pokemon_Owner.rb rename to Data/Scripts/014_Pokemon/005_Pokemon_Owner.rb diff --git a/Data/Scripts/013_Pokemon/006_Pokemon_Deprecated.rb b/Data/Scripts/014_Pokemon/006_Pokemon_Deprecated.rb similarity index 100% rename from Data/Scripts/013_Pokemon/006_Pokemon_Deprecated.rb rename to Data/Scripts/014_Pokemon/006_Pokemon_Deprecated.rb diff --git a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb index d9f549fb1..c447a06ed 100644 --- a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb +++ b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb @@ -24,7 +24,7 @@ class PokemonGlobalMetadata # @deprecated Use {Player#seen_purify_chamber} instead. This alias is slated to be removed in v20. def seenPurifyChamber Deprecation.warn_method('PokemonGlobalMetadata#seenPurifyChamber', 'v20', '$Trainer.seen_purify_chamber') - return (!@seenPurifyChamber.nil?) ? @seenPurifyChamber : $Trainer.seen_purify_chamber + return @seenPurifyChamber || false end # @deprecated Use {Player#seen_purify_chamber=} instead. This alias is slated to be removed in v20. @@ -40,7 +40,7 @@ class PokemonGlobalMetadata # @deprecated Use {Player#has_snag_machine} instead. This alias is slated to be removed in v20. def snagMachine Deprecation.warn_method('PokemonGlobalMetadata#snagMachine', 'v20', '$Trainer.has_snag_machine') - return (!@snagMachine.nil?) ? @snagMachine : $Trainer.has_snag_machine + return @snagMachine || false end # @deprecated Use {Player#has_snag_machine=} instead. This alias is slated to be removed in v20.