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 3a8e1762e..9fd764e7d 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/Map019.rxdata b/Data/Map019.rxdata
index 4fc9ebbdd..b490899ab 100644
Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ
diff --git a/Data/Map025.rxdata b/Data/Map025.rxdata
index 9f8aad366..9f197f934 100644
Binary files a/Data/Map025.rxdata and b/Data/Map025.rxdata differ
diff --git a/Data/Map146.rxdata b/Data/Map146.rxdata
index f56cde674..1c7682bab 100644
Binary files a/Data/Map146.rxdata and b/Data/Map146.rxdata differ
diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata
index eecfd33bf..b4861c7c5 100644
Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ
diff --git a/Data/Map628.rxdata b/Data/Map628.rxdata
index b1f084d23..4d334de16 100644
Binary files a/Data/Map628.rxdata and b/Data/Map628.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 0f327f0e2..5a7ab21cf 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index d61b76d3a..ef9183ac8 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -95,11 +95,11 @@ class Scene_Map
 
     $game_player.straighten
     $game_map.update
-    disposeSpritesets
+    #disposeSpritesets
     if RPG::Cache.need_clearing
       RPG::Cache.clear
     end
-    createSpritesets
+    #createSpritesets
     if $game_temp.transition_processing
       $game_temp.transition_processing = false
       Graphics.transition(20)
diff --git a/Data/Scripts/050_AddOns/BattleLounge.rb b/Data/Scripts/050_AddOns/BattleLounge.rb
index bc6565bda..d40d7be4d 100644
--- a/Data/Scripts/050_AddOns/BattleLounge.rb
+++ b/Data/Scripts/050_AddOns/BattleLounge.rb
@@ -186,12 +186,12 @@ def generateRandomFusionFromPokemon(dexNum, onlyCustomSprites = false, allowLege
   return speciesList.sample
 end
 
-def getRandomBasePokemon(includeLegendaries = false)
+def getRandomBasePokemon(includeLegendaries = false,maxNb=NB_POKEMON)
   legendaries =listLegendaryPokemonIds()
-  poke = rand(NB_POKEMON + 1)
+  poke = rand(maxNb + 1)
   return poke if includeLegendaries
   while legendaries.include?(poke)
-    poke = rand(NB_POKEMON + 1)
+    poke = rand(maxNb + 1)
   end
   return poke
 end
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 a63bb0f16..b72595074 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 2c6933d73..8d113cbfb 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/items.txt b/PBS/items.txt
index 452d026e0..ed2342272 100644
--- a/PBS/items.txt
+++ b/PBS/items.txt
@@ -603,7 +603,7 @@
 595,GOLDRING,Gold Ring,Gold Rings,1,20000,A ring made out of gold. It sells for a high price.,0,0,0,
 596,SEADRAFIN,Seadra Fin,Seadra Fins,1,14200,The dorsal fin of Seadra that is used as an ingredient in some medicine. It sells for a high price.,0,0,0,
 597,SACREDPOTION,Secret Potion,Secret Potions,2,7000,"An ancient, secret medicine. It fully revives all fainted Pokémon in a battle.",2,0,0,
-598,ABILITYCAPSULE,Ability Capsule,Ability Capsules,1,25000,"A capsule that allows a Pokémon with two Abilities to switch between these Abilities when it is used.",1,0,0,
+598,ABILITYCAPSULE,Ability Capsule,Ability Capsules,1,9500,"A capsule that allows a Pokémon with two Abilities to switch between these Abilities when it is used.",1,0,0,
 599,MAGICBOOTS,Magic Boots,Magic Boots,8,0,"A pair of magic boots that allow you to walk anywhere by pressing the CTRL key.",2,0,6,
 600,ANCIENTSTONE,unknown_item,unknown_items,1,1,This item has been removed from the game.,1,0,7,
 601,ICESTONE,Ice Stone,Ice Stones,1,5000,A peculiar stone that makes certain species of Pokémon evolve. It is made out of ice.,1,0,7,
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index 68cd3aff9..0f5df3ba1 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -644,7 +644,7 @@ Pokemon = B26H52,34 #Meowchu
 
 [CUEBALL,Isaiah]
 Pokemon = MACHOP,34 #GEOCHOP
-Pokemon = B68H76,34 #GOLCHAMP
+Pokemon = B67H25,34 #machoke + pikachu
 ##############################
 
 [BIKER,Virgil]
@@ -1853,11 +1853,11 @@ Pokemon = B24H42,38
 #Rocket bully
 
 [TEAMROCKET_M,Cyrus]
-Pokemon = B141H105,39 
+Pokemon = B110H20,39 #Weezing + raticate
 #########################
 
 [TEAMROCKET_F,Sam]
-Pokemon = B139H97,39 
+Pokemon = B51H24,39		#Dugtrio + arbok 
 ########################
 
 ##########################