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 d940ad63a..065a7e253 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 15f906746..7edd44774 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/Map008.rxdata b/Data/Map008.rxdata
index b18aba7cd..e639c5012 100644
Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ
diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata
index 2d7ea7b15..c7a6fb6ae 100644
Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ
diff --git a/Data/Map043.rxdata b/Data/Map043.rxdata
index 6ab697ec8..1c75e1b5a 100644
Binary files a/Data/Map043.rxdata and b/Data/Map043.rxdata differ
diff --git a/Data/Map056.rxdata b/Data/Map056.rxdata
index 06a55368d..2f80f5de8 100644
Binary files a/Data/Map056.rxdata and b/Data/Map056.rxdata differ
diff --git a/Data/Map057.rxdata b/Data/Map057.rxdata
index 7eb06889c..58ea931ff 100644
Binary files a/Data/Map057.rxdata and b/Data/Map057.rxdata differ
diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index dd0429bab..37ae20604 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/Map167.rxdata b/Data/Map167.rxdata
index 992a5a0dc..c5972bd6a 100644
Binary files a/Data/Map167.rxdata and b/Data/Map167.rxdata differ
diff --git a/Data/Map247.rxdata b/Data/Map247.rxdata
index 235b59e20..4c8071928 100644
Binary files a/Data/Map247.rxdata and b/Data/Map247.rxdata differ
diff --git a/Data/Map265.rxdata b/Data/Map265.rxdata
index 41393fec2..96a0b2018 100644
Binary files a/Data/Map265.rxdata and b/Data/Map265.rxdata differ
diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata
index 55c2e787b..6230c2406 100644
Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ
diff --git a/Data/Map267.rxdata b/Data/Map267.rxdata
index 67ebc0a79..035777cad 100644
Binary files a/Data/Map267.rxdata and b/Data/Map267.rxdata differ
diff --git a/Data/Map308.rxdata b/Data/Map308.rxdata
index 04a6abcaa..6e3b03b2f 100644
Binary files a/Data/Map308.rxdata and b/Data/Map308.rxdata differ
diff --git a/Data/Map462.rxdata b/Data/Map462.rxdata
index 83ddb8a23..10127cd9b 100644
Binary files a/Data/Map462.rxdata and b/Data/Map462.rxdata differ
diff --git a/Data/Map509.rxdata b/Data/Map509.rxdata
index a6212f83e..85fe61ebc 100644
Binary files a/Data/Map509.rxdata and b/Data/Map509.rxdata differ
diff --git a/Data/Map531.rxdata b/Data/Map531.rxdata
index 5a34b83c6..3714624ca 100644
Binary files a/Data/Map531.rxdata and b/Data/Map531.rxdata differ
diff --git a/Data/Map713.rxdata b/Data/Map713.rxdata
index e356c0341..2a035312a 100644
Binary files a/Data/Map713.rxdata and b/Data/Map713.rxdata differ
diff --git a/Data/Map714.rxdata b/Data/Map714.rxdata
index 47edc2726..9fd689b28 100644
Binary files a/Data/Map714.rxdata and b/Data/Map714.rxdata differ
diff --git a/Data/Map716.rxdata b/Data/Map716.rxdata
index 7b5c34654..e0ca59712 100644
Binary files a/Data/Map716.rxdata and b/Data/Map716.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 97e2bd1c5..ee7785df8 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
index f4bce3cf1..c48c97b7c 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
@@ -358,6 +358,17 @@ class PokemonEncounters
     level = rand(encounter[2]..encounter[3])
     return [encounter[1], level]
   end
+
+
+
+  def listPossibleEncounters(enctype)
+    if !enctype
+      raise ArgumentError.new(_INTL("Encounter type out of range"))
+    end
+    return @encounter_tables[enctype]
+  end
+
+
 end
 
 
diff --git a/Data/Scripts/013_Items/005_Item_PokeRadar.rb b/Data/Scripts/013_Items/005_Item_PokeRadar.rb
index 3b2068b73..e7bff118a 100644
--- a/Data/Scripts/013_Items/005_Item_PokeRadar.rb
+++ b/Data/Scripts/013_Items/005_Item_PokeRadar.rb
@@ -53,6 +53,40 @@ def pbPokeRadarCancel
   $PokemonTemp.pokeradar = nil
 end
 
+def listUnseenPokemonInCurrentRoute(encounterType)
+  processed = []
+  unseen = []
+  for encounter in $PokemonEncounters.listPossibleEncounters(encounterType)
+    species = encounter[0]
+    if !processed.include?(species)
+      if $Trainer.seen?(species)
+        processed<<species
+      else
+        unseen<<species
+        processed<<species
+      end
+    end
+  end
+  return unseen
+end
+
+
+#can only encounter rare if have seen every encounterable land pokemon on the route
+def canEncounterRarePokemon()
+  processed = []
+  for encounter in $PokemonEncounters.listPossibleEncounters($PokemonEncounters.pbEncounterType)
+    species = encounter[0]
+    if !processed.include?(species)
+      if $Trainer.seen[species]
+        processed<<species
+      else
+        return false
+      end
+    end
+  end
+  return true
+end
+
 def pbPokeRadarHighlightGrass(showmessage=true)
   grasses = []   # x, y, ring (0-3 inner to outer), rarity
   # Choose 1 random tile from each ring around the player
@@ -237,3 +271,5 @@ ItemHandlers::UseInField.add(:POKERADAR,proc { |item|
 ItemHandlers::UseFromBag.add(:POKERADAR,proc { |item|
   next (pbCanUsePokeRadar?) ? 2 : 0
 })
+
+
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index c8731e383..56dcb6bc0 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -102,7 +102,7 @@ ItemHandlers::UseInField.add(:TELEPORTER, proc { |item|
 })
 
 def useTeleporter()
-  if HiddenMoveHandlers.triggerCanUseMove(:TELEPORT, 0)
+  if HiddenMoveHandlers.triggerCanUseMove(:TELEPORT, 0,true)
     Kernel.pbMessage(_INTL("Teleport to where?", $Trainer.name))
     scene = PokemonRegionMapScene.new(-1, false)
     screen = PokemonRegionMap.new(scene)
diff --git a/Data/Scripts/050_AddOns/RandomAddOns.rb b/Data/Scripts/050_AddOns/RandomAddOns.rb
new file mode 100644
index 000000000..3383be74e
--- /dev/null
+++ b/Data/Scripts/050_AddOns/RandomAddOns.rb
@@ -0,0 +1,19 @@
+
+#Eevee quest
+Events.onStepTaken+=proc {|sender,e|
+  next if !$game_switches[173]
+  next if !$game_switches[179] #If not outside of building
+  $game_variables[102]+=1
+
+  if $game_variables[102] % 100 == 0 then
+    $game_variables[101]+=1
+  end
+
+  if $game_variables[102] >= 400 then
+    if $game_variables[102] % 100 == 0 then
+      Kernel.pbMessage(_INTL("Eevee is getting tired. You should head back soon!"))
+      cry=pbResolveAudioSE(pbCryFile(133))
+      pbSEPlay(cry,100,100)
+    end
+  end
+}
\ No newline at end of file
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 e119348ec..bd17541c7 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 6d375ff7e..838a3a9d6 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
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index a93e240ed..9128b49f9 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -1802,45 +1802,45 @@ Pokemon = BELLSPROUT,77
 ######################################
 
 [TEAMROCKET_M,Phillip]
-Pokemon = B88H42,28 #Golmer,
+Pokemon = B88H42,26 #Golmer,
 ######################
 
 [TEAMROCKET_M,Paul]
-Pokemon = B109H33,28 #Nidofing,
+Pokemon = B109H33,26 #Nidofing,
 ########################
 
 [TEAMROCKET_M,Joffrey]
 Pokemon = KOFFING,21 #Tentata,
-Pokemon = B20H73,25 #Tentaicate,
+Pokemon = B20H73,23 #Tentaicate,
 ########################
 
 [TEAMROCKET_F,Virginia]
-Pokemon = KOFFING,28 #Koffduo,
+Pokemon = KOFFING,26 #Koffduo,
 #######################
 
 [TEAMROCKET_M,Lionel]
-Pokemon = B20H70,24 #Weepinicate,
-Pokemon = B88H44,24 #Gloomer,
+Pokemon = B20H70,22 #Weepinicate,
+Pokemon = B88H44,22 #Gloomer,
 ######################
 
 [TEAMROCKET_M,Richard]
-Pokemon = KOFFING,24 #Koffcruel,
-Pokemon = B88H81,24 #Magnemer,
+Pokemon = KOFFING,22 #Koffcruel,
+Pokemon = B88H81,22 #Magnemer,
 #####################
 
 [TEAMROCKET_F,Kaitlin]
-Pokemon = B100H132,28 #Ditorb,
+Pokemon = B100H132,26 #Ditorb,
 	Moves = TRANSFORM,CHARGEBEAM,LIGHTSCREEN,SONICBOOM
 	AbilityIndex = 0
-Pokemon = B147H88,29 #Gritini,
+Pokemon = B147H88,25 #Gritini,
 #######################
 
 [TEAMROCKET_M,Omar]
-Pokemon = B17H109,28 #Koffeoto,
+Pokemon = B17H109,26 #Koffeoto,
 ###################
 
 [TEAMROCKET_M,Max]
-Pokemon = B110H100,27 #Voltzing,
+Pokemon = B110H100,25 #Voltzing,
 ####################
 
 #####################################
@@ -1927,23 +1927,23 @@ Pokemon = B142H142,55 #mega aerodactyl
 ###################
 
 [TEAMROCKET_M,Doug]
-Pokemon = B15H81,30 #Magnedrill,
+Pokemon = B15H81,28 #Magnedrill,
 ###################
 
 [TEAMROCKET_M,Chad]
-Pokemon = GOLBAT,30 #Goleotto,
-Pokemon = EKANS,30 #Ratkans,
-Pokemon = B88H116,30 #horsmer,
+Pokemon = GOLBAT,24 #Goleotto,
+Pokemon = EKANS,24 #Ratkans,
+Pokemon = B88H116,25 #horsmer,
 ###################
 
 [TEAMROCKET_M,Stephan]
-Pokemon = B24H53,35 #Perbok,
+Pokemon = B24H53,30 #Perbok,
 ###################
 
 [TEAMROCKET_M,Romeo]
-Pokemon = DROWZEE,31 #Drowicate,
-Pokemon = KOFFING,31 #Psyfing,
-Pokemon = B67H72,33 #Tentachoke,
+Pokemon = DROWZEE,29 #Drowicate,
+Pokemon = KOFFING,29 #Psyfing,
+Pokemon = B67H72,31 #Tentachoke,
 
 #####################################
 ####
@@ -1951,9 +1951,9 @@ Pokemon = B67H72,33 #Tentachoke,
 
 [ROCKETBOSS,Giovanni,0]
 Items = MAXPOTION
-Pokemon = B95H24,34 #Arbix,
-Pokemon = B131H111,34 #Rhyras,
-Pokemon = B115H93,37 #Hauntkan,
+Pokemon = B95H24,32 #Arbix,
+Pokemon = B131H111,32 #Rhyras,
+Pokemon = B115H93,35 #Hauntkan,
 ##############################
 
 ##################
diff --git a/changelog.txt b/changelog.txt
index af90367d0..a129306fc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -48,7 +48,7 @@ Added Features
 - Added 12 new TMs and 5 new Move tutors
 - Removed the Mt. Silver requirement for making triple fusions
 - Added an option to set the default battle type (single, double, triple) - Only available if beat the game at least once
-
+- Traded Pokémon now become owned by player when fused
 	
 ## Maps ##
 - Changed some tiles in Vermillion City
@@ -65,6 +65,7 @@ Added Features
 - Renamed Spring boots to Golbat Boots
 - New debug options
 - Item stack limit increased to 999
+- Added overworld animations for Cut and Rock Smash
 
 #################
 #	Bug fixes	#