random wip stuff

Data/Scripts/010_Data/002_PBS data/013_Trainer.rb

@@ -206,6 +206,7 @@ module GameData
     end
 
     def replaceSingleSpeciesModeIfApplicable(species)
+      return species if getDexNumberForSpecies(species) >= Settings::ZAPMOLCUNO_NB
       if $game_switches[SWITCH_SINGLE_POKEMON_MODE]
         if $game_switches[SWITCH_SINGLE_POKEMON_MODE_HEAD]
           return replaceFusionsHeadWithSpecies(species)

Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb

@@ -782,6 +782,8 @@ end
 
 def pbEndSurf(_xOffset, _yOffset)
   return false if !$PokemonGlobal.surfing
+  return false if !$PokemonGlobal.diving
+
   x = $game_player.x
   y = $game_player.y
   if $game_map.terrain_tag(x, y).can_surf && !$game_player.pbFacingTerrainTag.can_surf || !$game_map.terrain_tag(x, y).can_surf

Data/Scripts/025-Randomizer/randomizer gym leader edit.rb

@@ -28,7 +28,7 @@
 #
 
 #GYM_TYPES_ARRAY = [0,5,11,13,12,3,14,10,4,1,0,6,2,16,7,15,1,8,15,1,7,16,18,17,7,16]
-GYM_TYPES_CLASSIC = [:NORMAL, :ROCK, :WATER, :ELECTRIC, :GRASS, :POISON, :PSYCHIC, :FIRE, :GROUND, :FIGHTING, :NORMAL, :BUG, :FLYING, :DRAGON, :GHOST, :ICE, :FIGHTING, :STEEL, :ICE, :FIGHTING, :GHOST, :DRAGON, :FAIRY, :DARK, :GHOST, :DRAGON]
+GYM_TYPES_CLASSIC = [:NORMAL, :ROCK, :WATER, :ELECTRIC, :GRASS, :POISON, :PSYCHIC, :FIRE, :GROUND, :FIGHTING, :NORMAL, :BUG, :FLYING, :DRAGON, :GHOST, :ICE, :FIGHTING, :STEEL, :ICE, :FIGHTING, :GHOST, :DRAGON, :FAIRY, :DARK, :GHOST, :ROCK]
 GYM_TYPES_MODERN = [:NORMAL, :STEEL, :ICE, :FIGHTING, :BUG, :DARK, :FAIRY, :PSYCHIC, :NORMAL, :FIGHTING, :FAIRY, :GRASS, :BUG, :DRAGON, :FIRE, :GHOST, :GROUND, :ELECTRIC, :WATER, :ROCK, :POISON, :FLYING, :FAIRY, :DARK, :GHOST, :DRAGON]
 GYM_TYPES_ARRAY = ($game_switches && $game_switches[SWITCH_MODERN_MODE]) ? GYM_TYPES_MODERN : GYM_TYPES_CLASSIC
 

Data/Scripts/050_AddOns/MultiSaves.rb

@@ -100,6 +100,7 @@ module SaveData
     # should never reach here since the original file should always exist
     return file
   end
+
   # See self.get_next_slot
   def self.get_prev_slot(file_list, file)
     return self.get_next_slot(file_list.reverse, file)
@@ -298,6 +299,26 @@ class PokemonLoadScreen
     end
   end
 
+  def checkEnableSpritesDownload
+    if $PokemonSystem.download_sprites && $PokemonSystem.download_sprites  != 0
+      customSprites = getCustomSpeciesList
+      if !customSprites
+        promptEnableSpritesDownload
+      else
+        if customSprites.length < 1000
+          promptEnableSpritesDownload
+        end
+      end
+    end
+  end
+
+  def promptEnableSpritesDownload
+    message = "Some sprites appear to be missing from your game. \nWould you like the game to download sprites automatically while playing? (this requires an internet connection)"
+    if pbConfirmMessage(message)
+      $PokemonSystem.download_sprites = 0
+    end
+  end
+
   def pbStartLoadScreen
     if ($game_temp.unimportedSprites && $game_temp.unimportedSprites.size > 0)
       handleReplaceExistingSprites()
@@ -305,12 +326,15 @@ class PokemonLoadScreen
     if ($game_temp.nb_imported_sprites && $game_temp.nb_imported_sprites > 0)
       pbMessage(_INTL("{1} new custom sprites were imported into the game", $game_temp.nb_imported_sprites.to_s))
     end
+    checkEnableSpritesDownload
+
     $game_temp.nb_imported_sprites = nil
 
     copyKeybindings()
     save_file_list = SaveData::AUTO_SLOTS + SaveData::MANUAL_SLOTS
     first_time = true
-    loop do # Outer loop is used for switching save files
+    loop do
+      # Outer loop is used for switching save files
       if @selected_file
         @save_data = load_save_file(SaveData.get_full_path(@selected_file))
       else
@@ -356,7 +380,8 @@ class PokemonLoadScreen
         @scene.pbUpdate
       end
 
-    loop do # Inner loop is used for going to other menus and back and stuff (vanilla)
+      loop do
+        # Inner loop is used for going to other menus and back and stuff (vanilla)
         command = @scene.pbChoose(commands, cmd_continue)
         pbPlayDecisionSE if command != cmd_quit