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 3a99093c5..f3c5ff5c1 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/Map341.rxdata b/Data/Map341.rxdata
index 6bd62074b..9538d3d4f 100644
Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ
diff --git a/Data/Map371.rxdata b/Data/Map371.rxdata
index 97b92bae3..51eeb83b1 100644
Binary files a/Data/Map371.rxdata and b/Data/Map371.rxdata differ
diff --git a/Data/Map472.rxdata b/Data/Map472.rxdata
index 9298885a4..2a8fd2189 100644
Binary files a/Data/Map472.rxdata and b/Data/Map472.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 9f512d4b7..4b5b49bd0 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb b/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb
index 02c69ad5b..91dab0f8e 100644
--- a/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb	
+++ b/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb	
@@ -478,7 +478,7 @@ class PokeBattle_SafariZone
           if @ballCount<=0
             pbDisplay(_INTL("PA: You have no Safari Balls left! Game over!"))
             @decision = 2
-          elsif pbRandom(100)<5*escapeFactor
+          elsif can_escape(pkmn, escapeFactor)
             pbSEPlay("Battle flee")
             pbDisplay(_INTL("{1} fled!",pkmn.name))
             @decision = 3
@@ -503,3 +503,9 @@ class PokeBattle_SafariZone
     return @decision
   end
 end
+
+def can_escape(pokemon, escapeFactor)
+  return false if pokemon.shiny?
+  return false if pokemon.species == :VOLCARONA
+  return pbRandom(100)<5*escapeFactor
+end
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
index 5e8a35f4c..2204bc4ea 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
@@ -78,32 +78,42 @@ Pokémon Gold and Silver.
 Both games are made by Game Freak.
 
 All of the custom fused Pokémon sprites 
-were madeby various members of the sp
+were made by various members of the sp
 Pokémon Infinite Fusion Discord
 
 Including massive contributions from these users:
 
-Toad 900#1617, Kiwi#4199, Aquatic#7954, 
-Knuckles3&Knuckles#7559, Katten#7455, Blaquaza#1347, 
-Blackboots#7369, Milchik#6233, Gdei#2810, 
-Universez#0767, Scarecrow_924#8531, mammuth use ursaluna#3114, 
-Kulgun#3323, Retrogamer#9934, Scrapi#6319, 
-PinkYoshi#2350, Tomate#6670, Stan#3932, 
-Xiapher#4244, Howls#4468, xoto#0766, 
-xigzagoon#9354, Beespoon#2222, NeoSoup#6526, 
-Sjoba_sheep#1111, Maelmc#9965, Thornsoflight#3245, 
-Xillo#5236, pengu#6874, Mope7#1139, 
-Gorky#1761, All-Seeing#9253, IGot50lbsOfTanneritelnMyAnus#4093, 
-Emisys#4024, JamoJauhis#4971, Cheepoof#8815, 
-Moon_Tah#2688, BButton#8097, Punko#1235, 
-NakaMagic#0774, Tabarnak#2210, M4rcus#0928, 
-Bubba-Rottweiler#7322, Keksgesicht#7133, Teamama#4369, 
-BTT#3408, calicorn#6994, Pain T#3334, 
-Taylor Mai#0134, Underuser#5401, AkumaDelta#2364, 
-Scotsman#6299, GenoRhye#3335, (✿◠‿◠)Kanger#3997, 
-JoshuLips#5010, GREEN#2016, SpiDrone#6590, 
-Bizmythe#4062, Silver#4784, gnose_#6945, 
-D'Octobre#2420, Tenedranox#5660
+Toad 900#1617<s>Kiwi#4199
+Aquatic#7954<s>Knuckles3&Knuckles#7559
+Katten#7455<s>Blaquaza#1347
+Blackboots#7369<s>Milchik#6233
+Gdei#2810<s>Universez#0767
+Scarecrow_924#8531<s>mammuth use ursaluna#3114
+Kulgun#3323<s>Retrogamer#9934
+Scrapi#6319<s>PinkYoshi#2350
+Tomate#6670<s>Stan#3932
+Xiapher#4244<s>Howls#4468
+xoto#0766<s>xigzagoon#9354
+Beespoon#2222<s>NeoSoup#6526
+Sjoba_sheep#1111<s>Maelmc#9965
+Thornsoflight#3245<s>Xillo#5236
+pengu#6874<s>Mope7#1139
+Gorky#1761<s>All-Seeing#9253
+IGot50lbsOfTanneritelnMyAnus#4093<s>Emisys#4024
+JamoJauhis#4971<s>Cheepoof#8815
+Moon_Tah#2688<s>BButton#8097
+Punko#1235<s>NakaMagic#0774
+Tabarnak#2210<s>M4rcus#0928
+Bubba-Rottweiler#7322<s>Keksgesicht#7133
+Teamama#4369<s>BTT#3408
+calicorn#6994<s>Pain T#3334
+Taylor Mai#0134<s>Underuser#5401
+AkumaDelta#2364<s>Scotsman#6299
+GenoRhye#3335<s>(✿◠‿◠)Kanger#3997
+JoshuLips#5010<s>GREEN#2016
+SpiDrone#6590<s>Bizmythe#4062
+Silver#4784<s>gnose_#6945
+D'Octobre#2420<s>Tenedranox#5660
 
 
 Other custom graphics:
@@ -111,7 +121,6 @@ calicorn, Doctor Miawoo, Frogman, Kiwi,
 Knuckles, magnuzone, ,mammuth89, Miawoo, 
 Milchik, Rick1234, Universez, UnworthyPie,
 
-
 The following free ressources were also used 
 with their respective authors' consent:
 
@@ -125,13 +134,18 @@ OceansLugiaSpirit,Pokemon-Diamond,
 rekman, Rick1234, SailorVicious,WolfPP
 
 Tileset graphics:
-Alucus BoOmxBiG, chimcharsfireworkd, 
-EpicDay, EternalTakai, Gallanty Heavy-Metal-Lover, 
-Hek-el-grande,DirtyWiggles, iametrine, Jorginho, 
-kizemaru-kurunosuke, KKKaito, kyle-dove, Minorthreat0987,
- Phyromatical, Pokemon-Diamond, rayd12smitty, Rossay, 
-Shiney570, Spacemotion, Speedialga, ThatsSoWitty Thurpok, 
-TyranitarDark, UltimoSpriter, WesleyFG,
+Alucus BoOmxBiG<s>chimcharsfireworkd
+EpicDay<s>EternalTakai
+Gallanty Heavy-Metal-Lover<s>Hek-el-grande
+DirtyWiggles<s>iametrine
+Jorginho<s>kizemaru-kurunosuke
+KKKaito<s>kyle-dove
+Minorthreat0987<s>Phyromatical
+Pokemon-Diamond<s>rayd12smitty
+Rossay<s>Shiney570
+Spacemotion<s>Speedialga
+ThatsSoWitty Thurpok<s>TyranitarDark
+UltimoSpriter<s>WesleyFG
 
 Music:    
 Pokeli, TailDoll666100
@@ -144,7 +158,6 @@ FL, KleinStudio, carmaniac, Wootius,
 andracass
 {INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE}
 
-
 Data sources:  
 Bulbapedia
 
@@ -157,7 +170,6 @@ Radical Raptr, RPD490,
 Takyon!, Pokegod7020, Drakath569,
 Florio, MrDeepDarkMind, snooper117
 
-
 "Pokémon Essentials" was created by:
 Flameguru
 Poccil (Peter O.)
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index 4bd0cbc59..04be884c7 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -589,3 +589,69 @@ def is_higher_version(gameVersion, latestVersion)
   end
   return latestVersion_parts.length <= gameVersion_parts.length
 end
+
+def get_current_game_difficulty
+  return :EASY if $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
+  return :HARD if $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+  return :NORMAL
+end
+
+def get_difficulty_text
+  if $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
+    return "Easy"
+  elsif $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+    return "Hard"
+  else
+    return "Normal"
+  end
+end
+
+def change_game_difficulty(down_only=false)
+  message = "The game is currently on " + get_difficulty_text() + " difficulty."
+  pbMessage(message)
+
+
+  choice_easy = "Easy"
+  choice_normal = "Normal"
+  choice_hard = "Hard"
+  choice_cancel = "Cancel"
+
+
+  available_difficulties = []
+  currentDifficulty =get_current_game_difficulty
+  if down_only
+    if currentDifficulty == :HARD
+      available_difficulties << choice_hard
+      available_difficulties << choice_normal
+      available_difficulties << choice_easy
+    elsif currentDifficulty ==:NORMAL
+      available_difficulties << choice_normal
+      available_difficulties << choice_easy
+    elsif currentDifficulty ==:EASY
+      available_difficulties << choice_easy
+    end
+  else
+    available_difficulties << choice_easy
+    available_difficulties << choice_normal
+    available_difficulties << choice_hard
+  end
+  available_difficulties << choice_cancel
+  index = pbMessage("Select a new difficulty", available_difficulties, available_difficulties[-1])
+  choice = available_difficulties[index]
+  case choice
+  when choice_easy
+    $game_switches[SWITCH_GAME_DIFFICULTY_EASY]=true
+    $game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false
+  when choice_normal
+    $game_switches[SWITCH_GAME_DIFFICULTY_EASY]=false
+    $game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false
+  when choice_hard
+    $game_switches[SWITCH_GAME_DIFFICULTY_EASY]=false
+    $game_switches[SWITCH_GAME_DIFFICULTY_HARD] = true
+  when choice_cancel
+    return
+  end
+
+  message = "The game is currently on " + get_difficulty_text() + " difficulty."
+  pbMessage(message)
+end
\ No newline at end of file
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 c70a70141..0e39a4e1d 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index b740f6cf7..6298d1609 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