diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 0c83a0a05..a73775ed5 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map218.rxdata b/Data/Map218.rxdata
index aecff4f67..124f85819 100644
Binary files a/Data/Map218.rxdata and b/Data/Map218.rxdata differ
diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata
index 02132a9b1..af1bf7e97 100644
Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ
diff --git a/Data/Map760.rxdata b/Data/Map760.rxdata
index 7c0a1dc2e..ed6338d61 100644
Binary files a/Data/Map760.rxdata and b/Data/Map760.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index d72a34c6a..122ea0640 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb
index 3f6e75f28..c394bb400 100644
--- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
@@ -205,6 +205,7 @@ module GameData
     def self.check_cry_file(species, form)
       species_data = self.get_species_form(species, form)
       return nil if species_data.nil?
+      return "Cries/BIRDBOSS_2" if $game_switches[SWITCH_BIRDBOSS_BATTLE]
       if species_data.is_fusion
         species_data = GameData::Species.get(getHeadID(species_data))
       end
diff --git a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb b/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb
index be64f703e..4ddd0eac8 100644
--- a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb	
+++ b/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb	
@@ -5,7 +5,7 @@
 
 def getTrainersDataMode
   mode = GameData::Trainer
-  if $game_switches && $game_switches[SWITCH_MODERN_MODE]
+  if $game_switches && $game_switches[SWITCH_MODERN_MODE] && !$game_switches[SWITCH_BIRDBOSS_BATTLE]
     mode = GameData::TrainerModern
   end
   return mode
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 2589f8ea8..4b64c6ed3 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index a11138c6c..58dc68745 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ