Fixes movesets reset bug

Data/Scripts/010_Data/002_PBS data/013_Trainer.rb

@@ -297,7 +297,7 @@ module GameData
         if isRematch
           nbRematch = getNumberRematch(rematchId)
           level = getRematchLevel(level, nbRematch)
-          species = evolveRematchPokemon(nbRematch, species)
+          species = getSpecies(evolveRematchPokemon(nbRematch, species)).id
         end
         pkmn = Pokemon.new(species, level, trainer, false)
 

Data/Scripts/013_Items/001_Item_Utilities.rb

@@ -173,7 +173,7 @@ def pbChangeLevel(pkmn, newlevel, scene)
       pbLearnMove(pkmn, i[1], true) { scene.pbUpdate }
     end
     # Check for evolution
-    newspecies = pkmn.check_evolution_on_level_up(scene)
+    newspecies = pkmn.check_evolution_on_level_up
     if newspecies
       pbFadeOutInWithMusic {
         evo = PokemonEvolutionScene.new

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

@@ -491,7 +491,6 @@ class PokemonEvolutionScene
 
   def pbStartScreen(pokemon,newspecies,reversing=false)
     @pokemon = pokemon
-
     @newspecies = newspecies
     @sprites = {}
     @bgviewport = Viewport.new(0,0,Graphics.width,Graphics.height)

Data/Scripts/049_Compatibility/UtilityMethods.rb

@@ -86,6 +86,54 @@ def extract_custom_sprites_that_evolve_into_non_customs(includeOnlyNextEvos=true
 end
 
 
+def extract_pokes_with_non_custom_final_evos(includeOnlyNextEvos=true)
+  outfile = "nonCustomFinals.csv"
+  customSpecies = getCustomSpeciesList()
+
+  alreadyWritten = []
+
+  File.open(outfile,"wb") { |f|
+    for dexNum in customSpecies
+      species = GameData::Species.get(dexNum)
+      dex_body = getBodyID(species)
+      dex_head = getHeadID(species,dex_body)
+
+      evolutions = species.get_evolutions
+      nextEvolutions=evolutions
+      if includeOnlyNextEvos
+        nextEvolutions = getNextEvolutions(species,evolutions)
+      end
+
+      next if nextEvolutions.empty?
+      for evolution in nextEvolutions
+        evoSpecies = evolution[0]
+        isFinalEvo = GameData::Species.get(evoSpecies).get_evolutions.empty?
+        if !customSpriteExists(evoSpecies) && !alreadyWritten.include?(evoSpecies) && isFinalEvo
+          body = getBodyID(evoSpecies)
+          head = getHeadID(evoSpecies,body)
+          f.write((evoSpecies.to_s) +";")
+          f.write((head.to_s) +";")
+          f.write(".;")
+          f.write((body.to_s) +";")
+          f.write("evolves from ;")
+          f.write(species.id.to_s) + ";"
+          f.write((dex_head.to_s) +";")
+          f.write(".;")
+          f.write((dex_body.to_s) +";")
+          f.write("\n")
+
+
+          alreadyWritten << evoSpecies
+        end
+      end
+    end
+  }
+
+end
+
+
+
+
 
 def extract_incomplete_evolution_lines
   outfile = "incompleteLines.txt"

Data/Scripts/050_AddOns/Gen 2.rb

@@ -229,7 +229,7 @@ def convertAllPokemon()
       end
     }
     Kernel.initRandomTypeArray()
-    if $game_switches[987] #randomized trainers
+    if $game_switches[SWITCH_RANDOM_TRAINERS] #randomized trainers
       Kernel.pbShuffleTrainers()
     end
     if $game_switches[956] #randomized pokemon
@@ -265,7 +265,7 @@ end
 
 
 def convertTrainers()
-  if ($game_switches[987])
+  if ($game_switches[SWITCH_RANDOM_TRAINERS])
     Kernel.pbShuffleTrainers()
   end
 end

Data/Scripts/050_AddOns/UnrealTime.rb

@@ -97,7 +97,7 @@ module UnrealTime
   # Initial date. In sequence: Year, month, day, hour and minutes.
   # Method UnrealTime.reset resets time back to this time.
   def self.initial_date
-    return Time.local(2000,1,1, 12,0)
+    return Time.local(2000,1,1, 4,0)
   end
 
   # Advance to next time. If time already passed, advance

Data/Scripts/050_AddOns/mapExporter2.rb

@@ -80,6 +80,7 @@ module MapExporter
         for z in 0..2
           tile_id = @@map.data[x, y, z] || 0
           priority = @@map.priorities[tile_id]
+          next if priority == nil
           next if priority != 1
           tag_data = GameData::TerrainTag.try_get(@@map.terrain_tags[tile_id])
           next if !tag_data || tag_data.shows_reflections
@@ -158,6 +159,7 @@ module MapExporter
         for z in 0..2
           tile_id = @@map.data[x, y, z] || 0
           priority = @@map.priorities[tile_id]
+          next if priority == nil
           next if priority >= 1
           tag_data = GameData::TerrainTag.try_get(@@map.terrain_tags[tile_id])
           next if !tag_data || tag_data.shows_reflections
@@ -188,6 +190,7 @@ module MapExporter
         for z in 0..2
           tile_id = @@map.data[x, y, z] || 0
           priority = @@map.priorities[tile_id]
+          next if priority == nil
           next if priority < 2
           tag_data = GameData::TerrainTag.try_get(@@map.terrain_tags[tile_id])
           next if !tag_data || tag_data.shows_reflections