silph co. 5.1

Data/Scripts/001_Settings.rb

@@ -166,7 +166,7 @@ module Settings
   BADGE_FOR_CUT = 1
   BADGE_FOR_FLASH = 1
   BADGE_FOR_ROCKSMASH = 0
-  BADGE_FOR_SURF = 5
+  BADGE_FOR_SURF = 6
   BADGE_FOR_FLY = 3
   BADGE_FOR_STRENGTH = 5
   BADGE_FOR_DIVE = 9

Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb

@@ -390,8 +390,8 @@ Events.onAction += proc { |_sender, _e|
       break
     end
     if surface_map_id &&
-      #$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
+      $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
-      $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_surf
+      #$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_surf
       pbSurfacing
     end
   else

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -147,6 +147,12 @@ module GameData
         return sprintf(base_path + "144.145.146")
       when Settings::ZAPMOLCUNO_NB + 22 #birdBoss right
         return sprintf(base_path +"invisible")
+      when Settings::ZAPMOLCUNO_NB + 23 #sinnohboss left
+        return sprintf(base_path +"invisible")
+      when Settings::ZAPMOLCUNO_NB + 24 #sinnohboss middle
+        return sprintf(base_path +"343.344.345")
+      when Settings::ZAPMOLCUNO_NB + 25 #sinnohboss right
+        return sprintf(base_path +"invisible")
       else
         return sprintf(base_path + "000")
       end

PBS/trainers.txt

@@ -1980,21 +1980,21 @@ Pokemon = B67H72,31 #Tentachoke,
 [ROCKETBOSS,Giovanni,0]
 Items = MAXPOTION
 Pokemon = B95H24,32 #Arbix,
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 Pokemon = B131H111,32 #Rhyras,
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 Pokemon = B115H93,35 #Hauntkan,
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 [ROCKETBOSS,Giovanni,4]		#Silph co
 Items = MAXPOTION
 Pokemon = B33H57,45 #nidorino + primeape
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 Pokemon = B131H112,45 #rhydon + lapras
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 Pokemon = B115H94,47 #gengar + kangaskhan
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 Pokemon = B31H28,51 #nidoqueen + Sandslash
-	Ball = ROCKETBALL
+	Ball = ULTRABALL
 
 ##############################
 
@@ -2237,42 +2237,61 @@ Pokemon = B131H265,50 #Rhyras,
 	Moves = SURF,BULLDOZE,SANDSTORM,SING
 	AbilityIndex = 1
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B51H125,50 #Electatrio,
 	Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B68H76,52 #GOLCHAMP,
 	Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B248H273,54 #DNIDOKING,
 	Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB
 	AbilityIndex = 1
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B143H112,54 #snordon,
 	Moves = EARTHQUAKE,REST,SNORE,HORNDRILL
 	AbilityIndex = 0
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
 
 [LEADER_Giovanni,Giovanni,1]
 Items = FULLRESTORE,FULLRESTORE
 Pokemon = B131H265,72 #Rhyras,
 	Moves = SURF,BULLDOZE,SANDSTORM,SING
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B51H125,73 #Electatrio,
 	Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B68H76,74 #GOLCHAMP,
 	Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B248H273,72 #DNIDOKING,
 	Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
+
 Pokemon = B143H112,75 #Nidon,
 	Moves = EARTHQUAKE,REST,SNORE,HORNDRILL
 	Item = 	SOFTSAND
+	Ball = ULTRABALL
 Pokemon = B299H248,75 #TYRANCHOMP
 	Item = SOFTSAND
+	Ball = ULTRABALL
 #######################
 #### E4 ###############
 ###################
@@ -3556,17 +3575,17 @@ Pokemon = BIRDBOSS,50 #
 
 [ROCKETBOSS,Giovanni,5]
 Items = FULLHEAL,FULLHEAL,FULLHEAL
-Pokemon = BIRDBOSS_3,60 #		#Articuno
+Pokemon = BIRDBOSS_3,50 #		#Articuno
 	Moves = HAZE,REFLECT,ICEBEAM,ROOST
 	Ball = INVISIBALL
 	AbilityIndex = 0
 	Item = CHARTIBERRY
-Pokemon = BIRDBOSS_2,60 #		#Moltres
+Pokemon = BIRDBOSS_2,50 #		#Moltres
 	Moves = TAILWIND,SAFEGUARD,FLAMETHROWER,ROOST
 	Ball = MASTERBALL
 	AbilityIndex = 0
 	Item = CHARTIBERRY
-Pokemon = BIRDBOSS_1,60 #		#Zapdos
+Pokemon = BIRDBOSS_1,50 #		#Zapdos
 	Moves = LIGHTSCREEN,THUNDERBOLT,DRILLPECK,ROOST
 	Ball = INVISIBALL
 	AbilityIndex = 0