Revert "6.0 release"

This reverts commit a0aea8f030.

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

@@ -113,14 +113,6 @@ 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
@@ -214,6 +206,8 @@ 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"))
@@ -226,7 +220,6 @@ 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,10 +607,6 @@ 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)
 
@@ -621,17 +617,8 @@ class PokemonEvolutionScene
     @pokemon.form    = 0 if @pokemon.isSpecies?(:MOTHIM)
     @pokemon.calc_stats
     # See and own evolved species
-    #
-
-    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
-
-
+    $Trainer.pokedex.register(@pokemon)
+    $Trainer.pokedex.set_owned(@newspecies)
 
     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 Chardub (Frogman)
+By Frogman
 
 General graphics / Music / Intellectual property
 Nintendo
 GameFreak
 
 Programming / Eventing:
-Chardub
+Frogman
 
 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:
-Chardub, Kiwikelly
+Frogman
 Some of the maps were based on work by:
 BenGames, Zeak6464
 
 Gameplay / Story:
-Chardub 
+Frogman 
 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 managers
-Kiwikelly, Payapon, Thornsoflight
+Sprites pack manager
+Kiwi
 
 Sprite Managers
 avianAnnihilator<s>Blaquaza
@@ -88,7 +88,7 @@ Howls<s>Ignus
 Kiwi<s>Maelmc
 Milchik the Miltank<s>Payapon
 Pix<s>Rosemagwin
-Thornsoflight
+Thorns
 
 
 All of the custom fused Pokémon sprites 
@@ -100,12 +100,11 @@ Including massive contributions from these users:
 {SPRITER_CREDITS}
 
 
+
 Other custom graphics:
-Kiwikelly
-Knuckles
-UnworthyPie
-Doctor Miawoo
-Chardub
+calicorn, Doctor Miawoo, Frogman, Kiwi,
+Knuckles, magnuzone, ,mammuth89, Miawoo, 
+Milchik, Rick1234, Universez, UnworthyPie,
 
 The following free ressources were also used 
 with their respective authors' consent: