removes pokemon.txt

This reverts commit 96e7ab30e9.

Data/Scripts/001_Settings.rb

@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '5.0.0'
+  GAME_VERSION = '6.1.0'
-  GAME_VERSION_NUMBER = "6.1.0"
+  GAME_VERSION_NUMBER = "6.1.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/004_Game classes/007_Game_Character.rb

@@ -97,6 +97,10 @@ class Game_Character
     end
   end
 
+  def set_opacity(opacity)
+    @opacity = opacity
+  end
+
   def move_speed=(val)
     return if val == @move_speed
     @move_speed = val

Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb

@@ -84,6 +84,9 @@ end
 def pbStartOver(gameover=false)
   $game_variables[VAR_CURRENT_GYM_TYPE]=-1
   $game_switches[SWITCH_LOCK_PLAYER_MOVEMENT]=false
+  clear_all_images()
+  $game_player.set_opacity(255)
+  $game_system.menu_disabled=false
   if pbInBugContest?
     pbBugContestStartOver
     return

Data/Scripts/014_Pokemon/001_Pokemon.rb

@@ -128,10 +128,8 @@ class Pokemon
   end
 
   def species_data
-    if !@species_data || @species != @species_data.species
+    @species_data = GameData::Species.get(@species)
-      @species_data = GameData::Species.get(@species)
+    return @species_data
-    end
-    return @species_data #GameData::Species.get(@species)
   end
 
   #=============================================================================
@@ -231,17 +229,16 @@ class Pokemon
   end
 
   def changeFormSpecies(oldForm, newForm)
-    is_already_old_form = self.isFusionOf(oldForm)  #A 466
+    is_already_old_form = self.isFusionOf(oldForm) #A 466
-    is_already_new_form = self.isFusionOf(newForm)  #P
+    is_already_new_form = self.isFusionOf(newForm) #P
-
 
     #reverse the fusion if it's a meloA and meloP fusion
     # There's probably a smarter way to do this but laziness lol
     if is_already_old_form && is_already_new_form
       if self.species_data.get_body_species() == oldForm
-        changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(newForm,oldForm))
+        changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(newForm, oldForm))
       else
-        changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(oldForm,newForm))
+        changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(oldForm, newForm))
       end
     else
       changeSpecies(self, oldForm, newForm) if is_already_old_form
@@ -251,11 +248,11 @@ class Pokemon
     calc_stats
   end
 
-  def changeSpecies(pokemon, speciesToReplace,newSpecies)
+  def changeSpecies(pokemon, speciesToReplace, newSpecies)
     if pokemon.isFusion?()
-      replaceFusionSpecies(pokemon,speciesToReplace,newSpecies)
+      replaceFusionSpecies(pokemon, speciesToReplace, newSpecies)
     else
-      changeSpeciesSpecific(pokemon,newSpecies)
+      changeSpeciesSpecific(pokemon, newSpecies)
     end
     $Trainer.pokedex.set_seen(pokemon.species)
     $Trainer.pokedex.set_owned(pokemon.species)

Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb

@@ -593,6 +593,7 @@ end
         oldindex = @index
         pbGoToPrevious
         if @index != oldindex
+          @selected_index=0
           pbUpdateDummyPokemon
           @available = pbGetAvailableForms
           pbSEStop
@@ -603,6 +604,7 @@ end
         oldindex = @index
         pbGoToNext
         if @index != oldindex
+          @selected_index=0
           pbUpdateDummyPokemon
           @available = pbGetAvailableForms
           pbSEStop

Data/Scripts/048_Fusion/SplitNames.rb

@@ -122,7 +122,7 @@ module GameData
     ["Sea", "king"],
     ["Star", "yu"],
     ["Star", "mie"],
-    ["Mr.", "mime"],
+    ["Mr. ", "mime"],
     ["Scy", "ther"],
     ["Jyn", "nx"],
     ["Electa", "buzz"],

Data/Scripts/DownloadedSettings.rb

@@ -1,6 +1,6 @@
 
 module Settings
-  SHINY_POKEMON_CHANCE = 16
+  SHINY_POKEMON_CHANCE = 32#16
   CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Sprite Credits.csv"
   SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
   VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"

Data/VERSION

@@ -1 +1 @@
-6.0
+6.1