update to latest 6.0 release

Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb

@@ -113,6 +113,14 @@ class PokemonEggHatch_Scene
       @pokemon.name = nickname
       @nicknamed = true
     end
+
+    if !$Trainer.pokedex.owned?(@pokemon.species)
+      $Trainer.pokedex.register(@pokemon)
+      $Trainer.pokedex.set_owned(@pokemon.species)
+      pbMessage(_INTL("{1}'s data was added to the Pokédex", @pokemon.name))
+      pbShowPokedex(@pokemon.species)
+    end
+
   end
 
   def pbEndScene
@@ -206,8 +214,6 @@ def pbHatch(pokemon)
   end
 
 
-  $Trainer.pokedex.register(pokemon)
-  $Trainer.pokedex.set_owned(pokemon.species)
   pokemon.record_first_moves
   if !pbHatchAnimation(pokemon)
     pbMessage(_INTL("Huh?\1"))
@@ -220,6 +226,7 @@ def pbHatch(pokemon)
       pokemon.name = nickname
     end
   end
+
 end
 
 Events.onStepTaken += proc { |_sender,_e|

Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb

@@ -607,6 +607,10 @@ class PokemonEvolutionScene
     # Check for consumed item and check if Pokémon should be duplicated
     pbEvolutionMethodAfterEvolution if !reversing
 
+
+    @pokemon
+    @pokemon.ability
+
     oldAbility = @pokemon.ability.id
     newSpecies = GameData::Species.get(@newspecies)
 
@@ -617,8 +621,17 @@ class PokemonEvolutionScene
     @pokemon.form    = 0 if @pokemon.isSpecies?(:MOTHIM)
     @pokemon.calc_stats
     # See and own evolved species
-    $Trainer.pokedex.register(@pokemon)
-    $Trainer.pokedex.set_owned(@newspecies)
+    #
+
+    if !$Trainer.pokedex.owned?(@newspecies)
+      $Trainer.pokedex.register(@pokemon)
+      $Trainer.pokedex.set_owned(@newspecies)
+      Kernel.pbMessageDisplay(@sprites["msgwindow"],
+                               _INTL("{1}'s data was added to the Pokédex", newspeciesname))
+      @scene.pbShowPokedex(@newspecies)
+    end
+
+
 
     if allNewPossibleAbilities.include?(oldAbility)
       @pokemon.ability=oldAbility

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -48,14 +48,14 @@ class Scene_Credits
   CREDIT = <<_END_
 
 Pokémon Infinite Fusion
-By Frogman
+By Chardub (Frogman)
 
 General graphics / Music / Intellectual property
 Nintendo
 GameFreak
 
 Programming / Eventing:
-Frogman
+Chardub
 
 Fused Pokemon Sprites  :
 Japeal - Pokefusion 2
@@ -66,19 +66,19 @@ rip the sprites and to the owners of Japeal
 for accepting to share their generated sprites.
 
 Maps:
-Frogman
+Chardub, Kiwikelly
 Some of the maps were based on work by:
 BenGames, Zeak6464
 
 Gameplay / Story:
-Frogman 
+Chardub 
 The story and dialogues were based 
 off Pokémon Red and Blue, as well as
 Pokémon Gold and Silver.
 Both games are made by Game Freak.
 
-Sprites pack manager
-Kiwi
+Sprites pack managers
+Kiwikelly, Payapon, Thornsoflight
 
 Sprite Managers
 avianAnnihilator<s>Blaquaza
@@ -88,7 +88,7 @@ Howls<s>Ignus
 Kiwi<s>Maelmc
 Milchik the Miltank<s>Payapon
 Pix<s>Rosemagwin
-Thorns
+Thornsoflight
 
 
 All of the custom fused Pokémon sprites 
@@ -100,11 +100,12 @@ Including massive contributions from these users:
 {SPRITER_CREDITS}
 
 
-
 Other custom graphics:
-calicorn, Doctor Miawoo, Frogman, Kiwi,
-Knuckles, magnuzone, ,mammuth89, Miawoo, 
-Milchik, Rick1234, Universez, UnworthyPie,
+Kiwikelly
+Knuckles
+UnworthyPie
+Doctor Miawoo
+Chardub
 
 The following free ressources were also used 
 with their respective authors' consent: