WIP 5.1 stuff

Data/Scripts/001_Settings.rb

@@ -43,6 +43,7 @@ module Settings
   HARD_MODE_LEVEL_MODIFIER = 1.1
 
   ZAPMOLCUNO_NB = 176821
+  MAPS_WITHOUT_SURF_MUSIC = [762]
 
   # The generation that the battle system follows. Used throughout the battle
   # scripts, and also by some other settings which are used in and out of battle
@@ -169,7 +170,7 @@ module Settings
   BADGE_FOR_FLY = 3
   BADGE_FOR_STRENGTH = 5
   BADGE_FOR_DIVE = 9
-  BADGE_FOR_WATERFALL = 10
+  BADGE_FOR_WATERFALL = 8
   BADGE_FOR_TELEPORT = 3
   BADGE_FOR_BOUNCE = 8
   BADGE_FOR_ROCKCLIMB = 16
@@ -257,6 +258,7 @@ module Settings
   # will begin their numbering at 0 rather than 1 (e.g. Victini in Unova's Dex).
   DEXES_WITH_OFFSETS = []
 
+
   #=============================================================================
 
   # A set of arrays, each containing details of a graphic to be shown on the

Data/Scripts/010_Data/002_PBS data/008_Species.rb

@@ -277,39 +277,6 @@ module GameData
       return @species
     end
 
-    def get_pre_evolutions
-      preEvolutions = []
-      prevoSpecies = get_previous_species
-      prevo = GameData::Species.get(prevoSpecies)
-      preEvolutions << prevo.id if prevo.species != @species
-
-      prevo2 = GameData::Species.get(prevo.get_previous_species)
-      preEvolutions << GameData::Species.get(prevo2).id if prevo2 != @species && !preEvolutions.include?(prevo2.id)
-
-      prevo3 = GameData::Species.get(prevo2.get_previous_species)
-      preEvolutions << GameData::Species.get(prevo3).id if prevo3 != @species  && !preEvolutions.include?(prevo3.id)
-
-      prevo4 = GameData::Species.get(prevo3.get_previous_species)
-      preEvolutions << GameData::Species.get(prevo4).id if prevo4 != @species && !preEvolutions.include?(prevo4.id)
-
-
-      prevo5 = GameData::Species.get(prevo4.get_previous_species)
-      preEvolutions << GameData::Species.get(prevo5).id if prevo5 != @species && !preEvolutions.include?(prevo5.id)
-
-      prevo6 = GameData::Species.get(prevo5.get_previous_species)
-      preEvolutions << GameData::Species.get(prevo6).id if prevo6 != @species && !preEvolutions.include?(prevo6.id)
-
-      echo preEvolutions
-      echo "\n"
-      return preEvolutions
-      # baby = GameData::Species.get(get_baby_species)
-      # familyEvolutions = baby.get_family_evolutions
-      # for evo in familyEvolutions
-      #   preEvolutions << evo[0] if evo[0] != @species
-      # end
-      # return preEvolutions
-    end
-
     def get_baby_species(check_items = false, item1 = nil, item2 = nil)
       ret = @species
       return ret if @evolutions.length == 0

Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb

@@ -735,7 +735,7 @@ def pbSurf
     pbCancelVehicles
     pbHiddenMoveAnimation(movefinder)
     surfbgm = GameData::Metadata.get.surf_BGM
-    pbCueBGM(surfbgm, 0.5) if surfbgm
+    pbCueBGM(surfbgm, 0.5) if surfbgm && !Settings::MAPS_WITHOUT_SURF_MUSIC.include?($game_map.map_id)
     pbStartSurfing
     return true
   end

Data/Scripts/016_UI/005_UI_Party.rb

@@ -1008,7 +1008,7 @@ class PokemonPartyScreen
   def pbPokemonMultipleEntryScreenEx(ruleset)
     annot = []
     statuses = []
-    ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("CANNOT ENTER")]
+    ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("BANNED")]
     positions = [_INTL("FIRST"), _INTL("SECOND"), _INTL("THIRD"), _INTL("FOURTH"),
                  _INTL("FIFTH"), _INTL("SIXTH"), _INTL("SEVENTH"), _INTL("EIGHTH"),
                  _INTL("NINTH"), _INTL("TENTH"), _INTL("ELEVENTH"), _INTL("TWELFTH")]

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -2156,6 +2156,7 @@ class PokemonStorageScreen
           pbDisplay(_INTL("{1} is already fused!", heldpoke.name))
           return
         end
+        p selected
         if(heldpoke.egg?)
           pbDisplay(_INTL("It's impossible to fuse an egg!"))
           return

Data/Scripts/021_Compiler/001_Compiler.rb

@@ -734,7 +734,7 @@ module Compiler
   end
 
   def main
-    return
+    #return
     return if !$DEBUG
     begin
       dataFiles = [

Data/Scripts/049_Compatibility/Constants.rb

@@ -21,6 +21,7 @@ SWITCH_REVERSED_MODE = 47
 SWITCH_GAME_DIFFICULTY_EASY = 665
 SWITCH_GAME_DIFFICULTY_HARD = 666
 SWITCH_MODERN_MODE=974
+SWITCH_V5_1=825
 
 #Game progression switches
 SWITCH_DURING_INTRO = 917

Data/Scripts/049_Compatibility/UtilityMethods.rb

@@ -85,75 +85,6 @@ def extract_custom_sprites_that_evolve_into_non_customs(includeOnlyNextEvos=true
 
 end
 
-def listAllFinalEvos
-  finalEvos = []
-  for dexNum in 1..PBSpecies.maxValue
-    species = GameData::Species.get(dexNum)
-    if species.get_evolutions.length==0
-      finalEvos << species
-    end
-  end
-  return finalEvos
-end
-
-def getPreEvoCustomSprites(species, customSPritesList)
-  pre_evos_with_custom_sprites = []
-
-  for species_id in species.get_pre_evolutions
-    species = GameData::Species.get(species_id)
-    dexNum = species.id_number
-    if customSPritesList.include?(dexNum)
-      pre_evos_with_custom_sprites << species
-      # echo species
-      # echo "\n"
-    end
-  end
-  return pre_evos_with_custom_sprites
-end
-
-def extract_pokes_with_non_custom_final_evos2()
-
-  outfile = "nonCustomFinals2.csv"
-  customSpecies = getCustomSpeciesList()
-  alreadyWritten = []
-  finalEvolutions = listAllFinalEvos()
-  echo "\n\n"
-  echo "WRITING FILE..."
-  echo "\n\n"
-
-  File.open(outfile,"wb") { |f|
-    for evo in finalEvolutions
-    dexnum = evo.id_number
-    if !customSpecies.include?(dexnum)
-      preEvoCustomSprites = getPreEvoCustomSprites(evo,customSpecies)
-      if preEvoCustomSprites.length >0
-
-        body = getBodyID(evo.id_number)
-        head = getHeadID(evo.id_number,body)
-
-        # f.write((head.to_s) +";")
-        # f.write(".;")
-        # f.write((body.to_s) +";")
-        f.write((head.to_s + "." + body.to_s) +";")
-        f.write(" evolves from : ;")
-        written_prevos=[]
-        for prevo in preEvoCustomSprites
-          next if written_prevos.include?(prevo)
-          prevoBody = getBodyID(prevo.id_number)
-          prevoHead = getHeadID(prevo.id_number,prevoBody)
-
-          f.write((prevoHead.to_s + "." + prevoBody.to_s) +";")
-          written_prevos << prevo
-        end
-        f.write("\n")
-      end
-    end
-    end
-
-  }
-end
-
-
 
 def extract_pokes_with_non_custom_final_evos(includeOnlyNextEvos=true)
   outfile = "nonCustomFinals.csv"

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -141,6 +141,12 @@ module GameData
         return sprintf(base_path +"316.319.322")
       when Settings::ZAPMOLCUNO_NB + 19
         return sprintf(base_path +"317.320.323")
+      when Settings::ZAPMOLCUNO_NB + 20 #birdBoss Left
+        return sprintf(base_path +"invisible")
+      when Settings::ZAPMOLCUNO_NB + 21 #birdBoss middle
+        return sprintf(base_path + "144.145.146")
+      when Settings::ZAPMOLCUNO_NB + 22 #birdBoss right
+        return sprintf(base_path +"invisible")
       else
         return sprintf(base_path + "000")
       end
@@ -165,7 +171,7 @@ module GameData
       customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + filename)
       species = getSpecies(dex_number)
       use_custom = customPath && !species.always_use_generated
-      if use_custom && dex_number > Settings::NB_POKEMON
+      if use_custom
         return customPath
       end
       return Settings::BATTLERS_FOLDER + folder + "/" + filename

PBS/items.txt

@@ -666,5 +666,7 @@
 658,TM00,TM00,TM00s,4,0,"A strange TM developped by Team Rocket. It appears to be related to Pokémon fusion.",3,0,0,FUSIONSWAP
 659,TM121,TM121,TM121s,4,10000,"The user shoots boiling hot water at its target. It may also leave the target with a burn.",3,0,0,SCALD
 660,LINKINGCORD,Linking Cord,Linking Cords,1,6000,"A cable exuding a mysterious energy. It’s loved by certain Pokémon.",1,0,7,
+661,INVISIBALL,Invisiball,Invisiball,3,200,"A Pokéball that is completely invisble to the human eye. You shouldn't be able to obtain this item",0,4,4,
+