diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata
index 2af518e8f..4c7736d06 100644
Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index eb17b5b44..fd09fa7df 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
index 6b872c741..a78001ed7 100644
--- a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
+++ b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
@@ -202,8 +202,8 @@ class PokeBattle_Battle
           msg += _INTL("{1} sent out {2} and {3}!",t.full_name,
              @battlers[sent[0]].name,@battlers[sent[1]].name)
         when 3
-          if $PokemonTemp.battleRules["birdboss"]
-            msg += _INTL("{1} sent out Zapmolticuno!",t.full_name)
+          if $game_switches[SWITCH_BIRDBOSS_BATTLE]
+            msg += _INTL("{1} sent out Zapmolcuno!",t.full_name)
           else
             msg += _INTL("{1} sent out {2}, {3} and {4}!",t.full_name,
                          @battlers[sent[0]].name,@battlers[sent[1]].name,@battlers[sent[2]].name)
diff --git a/Data/System.rxdata b/Data/System.rxdata
index bd703d42c..921ad9057 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/map_metadata.dat b/Data/map_metadata.dat
index 2752acdbd..e4cf58066 100644
Binary files a/Data/map_metadata.dat and b/Data/map_metadata.dat differ
diff --git a/Data/messages.dat b/Data/messages.dat
index a8accbeec..6f2b4a57e 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/trainers.dat b/Data/trainers.dat
index 7b77a064d..5652e86bc 100644
Binary files a/Data/trainers.dat and b/Data/trainers.dat differ
diff --git a/PBS/encounters.txt b/PBS/encounters.txt
index 2a5d21230..8dc9f2395 100644
--- a/PBS/encounters.txt
+++ b/PBS/encounters.txt
@@ -52201,6 +52201,513 @@ REMORAID,40,40
 REMORAID,40,40
 REMORAID,40,40
 REMORAID,40,40
+762 #Offshore road
+25,10,10
+Land
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+HONEDGE,16,22
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+KRABBY,33,36
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GEODUDE,30,34
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+GRAVELER,36,39
+Water
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACOOL,32,35
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+TENTACRUEL,35,38
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+WAILMER,32,34
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+SEEL,35,35
+OldRod
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+MAGIKARP,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+HORSEA,10,10
+GoodRod
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+MAGIKARP,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+QWILFISH,20,20
+SuperRod
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+SEADRA,20,20
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+OCTILLERY,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+REMORAID,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
+GYARADOS,40,40
 312 #Route 46
 25,10,10
 Land
diff --git a/PBS/metadata.txt b/PBS/metadata.txt
index 1b976d30a..73299bdf1 100644
--- a/PBS/metadata.txt
+++ b/PBS/metadata.txt
@@ -1784,4 +1784,8 @@ Bicycle=true
 MapPosition=1,22,6
 Outdoor=true
 ShowArea=true
-Environment = Grass
\ No newline at end of file
+Environment = Grass
+[662]
+# Offshore route
+Outdoor=true
+ShowArea=true
\ No newline at end of file
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index 5de99d0ed..318b83043 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -3556,8 +3556,8 @@ Pokemon = BIRDBOSS,50 #
 
 [ROCKETBOSS,Giovanni,5]
 Items = FULLHEAL,FULLHEAL,FULLHEAL
-Pokemon = BIRDBOSS_1,60 #		#Zapdos
-	Moves = LIGHTSCREEN,THUNDERBOLT,DRILLPECK,ROOST
+Pokemon = BIRDBOSS_3,60 #		#Articuno
+	Moves = HAZE,REFLECT,ICEBEAM,ROOST
 	Ball = INVISIBALL
 	AbilityIndex = 0
 	Item = CHARTIBERRY
@@ -3566,8 +3566,8 @@ Pokemon = BIRDBOSS_2,60 #		#Moltres
 	Ball = MASTERBALL
 	AbilityIndex = 0
 	Item = CHARTIBERRY
-Pokemon = BIRDBOSS_3,60 #		#Articuno
-	Moves = HAZE,REFLECT,ICEBEAM,ROOST
+Pokemon = BIRDBOSS_1,60 #		#Zapdos
+	Moves = LIGHTSCREEN,THUNDERBOLT,DRILLPECK,ROOST
 	Ball = INVISIBALL
 	AbilityIndex = 0
 	Item = CHARTIBERRY