diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 91bc01f3a..4dd94835f 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata
index 0b53a8ae0..ddeb8cbb0 100644
Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ
diff --git a/Data/Map043.rxdata b/Data/Map043.rxdata
index 8d3f8c307..bfb2f9ef9 100644
Binary files a/Data/Map043.rxdata and b/Data/Map043.rxdata differ
diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata
index 8cccfb1bf..311fa3ac0 100644
Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ
diff --git a/Data/Map138.rxdata b/Data/Map138.rxdata
index e241afd28..df3c5ca35 100644
Binary files a/Data/Map138.rxdata and b/Data/Map138.rxdata differ
diff --git a/Data/Map180.rxdata b/Data/Map180.rxdata
index d8cf41144..18f10ab63 100644
Binary files a/Data/Map180.rxdata and b/Data/Map180.rxdata differ
diff --git a/Data/Map359.rxdata b/Data/Map359.rxdata
index 56a6ca2a3..b328a3c5b 100644
Binary files a/Data/Map359.rxdata and b/Data/Map359.rxdata differ
diff --git a/Data/Map435.rxdata b/Data/Map435.rxdata
index 926b5e7be..48b5d8f1f 100644
Binary files a/Data/Map435.rxdata and b/Data/Map435.rxdata differ
diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata
index d0d0b3b0e..be69ad67d 100644
Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ
diff --git a/Data/Map561.rxdata b/Data/Map561.rxdata
index 2c697ac61..105bdb304 100644
Binary files a/Data/Map561.rxdata and b/Data/Map561.rxdata differ
diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata
index 473b77ffd..43c10733f 100644
Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ
diff --git a/Data/Map721.rxdata b/Data/Map721.rxdata
index 701827188..b221782e0 100644
Binary files a/Data/Map721.rxdata and b/Data/Map721.rxdata differ
diff --git a/Data/Map769.rxdata b/Data/Map769.rxdata
new file mode 100644
index 000000000..3c46f1cec
Binary files /dev/null and b/Data/Map769.rxdata differ
diff --git a/Data/Map770.rxdata b/Data/Map770.rxdata
new file mode 100644
index 000000000..ef01b3698
Binary files /dev/null and b/Data/Map770.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index fd06d2fe0..f2658f335 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
index 4c838e677..5039e653e 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/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)
 
diff --git a/Data/Scripts/013_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb
index ff516c102..f311ec675 100644
--- a/Data/Scripts/013_Items/001_Item_Utilities.rb
+++ b/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
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
index f6e30898a..e1397cdd9 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb	
+++ b/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)
diff --git a/Data/Scripts/049_Compatibility/UtilityMethods.rb b/Data/Scripts/049_Compatibility/UtilityMethods.rb
index 00b160940..356579bb8 100644
--- a/Data/Scripts/049_Compatibility/UtilityMethods.rb
+++ b/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"
diff --git a/Data/Scripts/050_AddOns/Gen 2.rb b/Data/Scripts/050_AddOns/Gen 2.rb
index f1b2fc799..5c8461105 100644
--- a/Data/Scripts/050_AddOns/Gen 2.rb	
+++ b/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
diff --git a/Data/Scripts/050_AddOns/UnrealTime.rb b/Data/Scripts/050_AddOns/UnrealTime.rb
index 29b445933..4cfc8b2e1 100644
--- a/Data/Scripts/050_AddOns/UnrealTime.rb
+++ b/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
diff --git a/Data/Scripts/050_AddOns/mapExporter2.rb b/Data/Scripts/050_AddOns/mapExporter2.rb
index 6282f4dcc..e3a5aa8be 100644
--- a/Data/Scripts/050_AddOns/mapExporter2.rb
+++ b/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
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index e022162e8..0982b9755 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 846799fe9..21025322b 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ