From e0e5cfebb7bf48228b749d619d84f6586427049c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 22 Aug 2021 00:00:51 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20Pok=C3=A9dex=20searches=20not=20conside?= =?UTF-8?q?ring=20the=20properties=20of=20alternate=20forms,=20fixed=20RMX?= =?UTF-8?q?P-style=20battle=20transitions=20not=20working,=20tweaked=20for?= =?UTF-8?q?m-inheriting=20code=20in=20breeding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../002_Battle triggering/002_Overworld_BattleIntroAnim.rb | 2 +- Data/Scripts/012_Overworld/007_Overworld_DayCare.rb | 5 +++-- Data/Scripts/016_UI/003_UI_Pokedex_Main.rb | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb index f56cf002e..58218dfd0 100644 --- a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb +++ b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb @@ -88,8 +88,8 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil) end # Play main animation Graphics.freeze - Graphics.transition(Graphics.frame_rate*1.25,sprintf("Graphics/Transitions/%s",anim)) viewport.color = Color.new(0,0,0,255) # Ensure screen is black + Graphics.transition(Graphics.frame_rate*1.25,sprintf("Graphics/Transitions/%s",anim)) # Slight pause after animation before starting up the battle scene (Graphics.frame_rate/10).times do Graphics.update diff --git a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb index ae87404ff..4b7b5435c 100644 --- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb +++ b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb @@ -193,8 +193,9 @@ def pbDayCareGenerateEgg egg.personalID = pid # Inheriting form if [:BURMY, :SHELLOS, :BASCULIN, :FLABEBE, :PUMPKABOO, :ORICORIO, :ROCKRUFF, :MINIOR].include?(babyspecies) - newForm = mother.form - newForm = 0 if mother.isSpecies?(:MOTHIM) + parent = (ditto0 || (!pkmn0.female? && ditto1)) ? father : mother + newForm = parent.form + newForm = 0 if parent.isSpecies?(:MOTHIM) egg.form = newForm end # Inheriting Alolan form diff --git a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb index 7f684f7ef..4a554e644 100644 --- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb +++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb @@ -140,7 +140,7 @@ class PokedexSearchSelectionSprite < SpriteWrapper self.src_rect.y = 88; self.src_rect.height = 44 when 3,4 # Height, weight self.src_rect.y = 132; self.src_rect.height = 44 - when 6 # Form + when 6 # Shape self.src_rect.y = 176; self.src_rect.height = 68 else # Reset/start/cancel self.src_rect.y = 244; self.src_rect.height = 40 @@ -325,7 +325,8 @@ class PokemonPokedex_Scene regionalSpecies.each_with_index do |species, i| next if !species next if !pbCanAddForModeList?($PokemonGlobal.pokedexMode, species) - species_data = GameData::Species.get(species) + _gender, form = $Trainer.pokedex.last_form_seen(species) + species_data = GameData::Species.get_species_form(species, form) color = species_data.color type1 = species_data.type1 type2 = species_data.type2 || type1 @@ -1107,7 +1108,7 @@ class PokemonPokedex_Scene newparam = pbDexSearchCommands(5,[params[8]],index) params[8] = newparam[0] if newparam!=nil pbRefreshDexSearch(params,index) - when 6 # Filter by form + when 6 # Filter by shape newparam = pbDexSearchCommands(6,[params[9]],index) params[9] = newparam[0] if newparam!=nil pbRefreshDexSearch(params,index)