diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index a311b9b5e..ece08c031 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 74144c7c3..6b8163164 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index b10cb1057..75e4bfcf5 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
index 674eb767d..760654a24 100644
--- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
+++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
@@ -41,17 +41,17 @@ def Kernel.initRandomTypeArray()
   $game_variables[VAR_GYM_TYPES_ARRAY] = $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] ? typesArray : GYM_TYPES_ARRAY
 end
 
-def setRivalStarter(starter1, starter2, starter3, choice)
-  starters = [starter1, starter2, starter3]
-  starters.delete_at(choice)
-  if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
-    rivalStarter = starters[0]
-  else
-    rivalStarter = starters[0] * NB_POKEMON + starters[1]
-  end
-  pbSet(VAR_RIVAL_STARTER, rivalStarter)
-  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
-end
+# def setRivalStarter(starter1, starter2, starter3, choice)
+#   starters = [starter1, starter2, starter3]
+#   starters.delete_at(choice)
+#   if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
+#     rivalStarter = starters[0]
+#   else
+#     rivalStarter = starters[0] * NB_POKEMON + starters[1]
+#   end
+#   pbSet(VAR_RIVAL_STARTER, rivalStarter)
+#   $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
+# end
 
 def setRivalStarterSpecific(rivalStarter)
   pbSet(VAR_RIVAL_STARTER, rivalStarter)
@@ -734,13 +734,13 @@ def fixRivalStarter()
   end
   starterChoice = pbGet(7)
 
-  s1 = $PokemonGlobal.psuedoBSTHash[1]
-  s2 = $PokemonGlobal.psuedoBSTHash[4]
-  s3 = $PokemonGlobal.psuedoBSTHash[7]
-  setRivalStarter(s3, s2, s1, starterChoice)
-
+  setRivalStarter(0, 1) if starterChoice == 2
+  setRivalStarter(0, 2) if starterChoice == 1
+  setRivalStarter(1, 2) if starterChoice == 0
+  setRivalStarter(0, 1) if starterChoice > 2
+  echoln pbGet(VAR_RIVAL_STARTER)
   #evolve en fct des badges
-  rivalStarter = pbGet(250)
+  rivalStarter = pbGet(VAR_RIVAL_STARTER)
 
   if $game_switches[68] #beat blue cerulean
     rivalStarter = evolveBody(rivalStarter)
diff --git a/Data/Scripts/051_AddOns/GameplayUtils.rb b/Data/Scripts/051_AddOns/GameplayUtils.rb
index ea6913fd9..03c1a820d 100644
--- a/Data/Scripts/051_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/051_AddOns/GameplayUtils.rb
@@ -1110,6 +1110,7 @@ def setRivalStarter(starterIndex1,starterIndex2)
     starter = GameData::Species.get(starterSpecies.get_baby_species(false)).id_number
   end
   pbSet(VAR_RIVAL_STARTER,starter)
+  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
   return starter
 end
 
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 5d76b2fac..eea5db822 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 4079ff9d6..ce46c9ae3 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ