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 71c6de4dc..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/Map318.rxdata b/Data/Map318.rxdata
index 4c0a59d5d..1038f1247 100644
Binary files a/Data/Map318.rxdata and b/Data/Map318.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 2f0bf9605..0b6bec3ef 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 91705fdcb..ff4e7b778 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.0.22 - beta"
+  GAME_VERSION_NUMBER = "5.0.24 - beta"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
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 497764dfd..231bb51f8 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
@@ -116,12 +116,15 @@ module GameData
 
     #todo customsListinCache so it's faster
     def generateRandomGymSpecies(old_species)
+      gym_index = pbGet(VAR_CURRENT_GYM_TYPE)
+      return old_species if gym_index == -1 || gym_index == 999
+
+      type_id = pbGet(VAR_GYM_TYPES_ARRAY)[gym_index]
+      return old_species if type_id == -1
+
       customsList = getCustomSpeciesList()
       bst_range = pbGet(VAR_RANDOMIZER_TRAINER_BST)
-      gym_index = pbGet(VAR_CURRENT_GYM_TYPE)
-      type_id = pbGet(VAR_GYM_TYPES_ARRAY)[gym_index]
       gym_type = GameData::Type.get(type_id)
-      return old_species if type_id == -1
       while true
         new_species = $game_switches[SWITCH_RANDOM_GYM_CUSTOMS] ? getSpecies(getNewCustomSpecies(old_species, customsList, bst_range)) : getSpecies(getNewSpecies(old_species, bst_range))
         if new_species.hasType?(gym_type)
@@ -147,6 +150,12 @@ module GameData
     end
 
     def add_generated_species_to_gym_array(new_species, trainerId)
+      if(new_species.is_a?(Symbol))
+        id = new_species
+      else
+        id = new_species.id_number
+      end
+
       expected_team_length = 1
       expected_team_length = $PokemonGlobal.randomTrainersHash[trainerId].length if $PokemonGlobal.randomTrainersHash[trainerId]
       new_team = []
@@ -154,7 +163,7 @@ module GameData
         new_team = $PokemonGlobal.randomGymTrainersHash[trainerId]
       end
       if new_team.length < expected_team_length
-        new_team << new_species.id_number
+        new_team << id
       end
       $PokemonGlobal.randomGymTrainersHash[trainerId] = new_team
     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 112d68219..4e6db9651 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