diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 7989f71f4..0aaf9edfa 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata
index 7e87f186e..6bd62074b 100644
Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ
diff --git a/Data/Map479.rxdata b/Data/Map479.rxdata
index 2bed9fafa..c28da926d 100644
Binary files a/Data/Map479.rxdata and b/Data/Map479.rxdata differ
diff --git a/Data/Map624.rxdata b/Data/Map624.rxdata
index ad28283d9..98d523503 100644
Binary files a/Data/Map624.rxdata and b/Data/Map624.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ffc3b8ac9..34977646f 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb
index 980a3ba1c..e3f99df6f 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/009_Scene_Animations.rb	
@@ -46,8 +46,10 @@ class PokeBattle_Scene
         #hidden ability animation
         if @battle.battlers[idxBattler].hasHiddenAbility?
           pbCommonAnimation("StatUp",@battle.battlers[idxBattler])
-          @battle.pbShowAbilitySplash(@battle.battlers[idxBattler],true)
-          @battle.pbHideAbilitySplash(@battle.battlers[idxBattler])
+          if @battle.is_a?(PokeBattle_Battle)
+            @battle.pbShowAbilitySplash(@battle.battlers[idxBattler],true)
+            @battle.pbHideAbilitySplash(@battle.battlers[idxBattler])
+          end
         end
 
         #shiny animation
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 c2732a0bb..02c69ad5b 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	
@@ -46,6 +46,10 @@ class PokeBattle_FakeBattler
     return $Trainer.owned?(pokemon.species)
   end
 
+  def hasHiddenAbility?
+    return @pokemon.hasHiddenAbility?
+  end
+
   def pbThis(lowerCase=false)
     return (lowerCase) ? _INTL("the wild {1}",name) : _INTL("The wild {1}",name)
   end
@@ -351,6 +355,7 @@ class PokeBattle_SafariZone
     return @sideSizes[index%2]
   end
 
+
   #=============================================================================
   # Trainers and owner-related
   #=============================================================================
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb
index 31abd452c..26c3a7185 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb	
@@ -343,6 +343,39 @@ class HallOfFame_Scene
     overlay.clear
     pbDrawTextPositions(overlay, [[_INTL("Welcome to the Hall of Fame!"),
                                    Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]])
+
+    writeCurrentDate(overlay, 120 , Graphics.height - 50)
+    writeGameMode(overlay, (Graphics.width / 2) + 100, Graphics.height - 50)
+  end
+
+  def writeCurrentDate(overlay, x, y)
+    currentTime = Time.new
+    timeString = currentTime.year.to_s + "-" + ("%02d" % currentTime.month) + "-" + ("%02d" % currentTime.day)
+    pbDrawTextPositions(overlay, [[_INTL("{1}", timeString), x, y, 2, BASECOLOR, SHADOWCOLOR]])
+  end
+
+  def writeGameMode(overlay, x, y)
+    gameMode = "Classic mode"
+    if $game_switches[SWITCH_MODERN_MODE]
+      gameMode = "Modern mode"
+    end
+    if $game_switches[SWITCH_SINGLE_POKEMON_MODE]
+      pokemon_number = pbGet(VAR_SINGLE_POKEMON_MODE)
+      if pokemon_number.is_a?(Integer) && pokemon_number >0
+        pokemon = GameData::Species.get(pokemon_number)
+        gameMode = pokemon.real_name + " mode"
+      else
+        gameMode = "Debug mode"
+      end
+    end
+    if $game_switches[SWITCH_RANDOMIZED_AT_LEAST_ONCE]
+      gameMode = "Randomized mode"
+    end
+    if $PokemonBag.pbQuantity(:MAGICBOOTS)>=1 || $DEBUG
+      gameMode = "Debug mode"
+    end
+
+    pbDrawTextPositions(overlay, [[_INTL("{1} ({2})", gameMode, getDifficulty), x, y, 2, BASECOLOR, SHADOWCOLOR]])
   end
 
   def pbAnimationLoop
@@ -438,13 +471,12 @@ class HallOfFame_Scene
   end
 
   def waitForInput
-      if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
-        return true
-      end
-      return false
+    if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
+      return true
+    end
+    return false
   end
 
-
   def pbUpdatePC
     # Change the team
     if @battlerIndex >= @hallEntry.size
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 0a82c61cd..e415e50ee 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -1800,6 +1800,11 @@ class PokemonStorageScreen
     index = selected[1]
     pokemon = @storage[box, index]
 
+    if pokemon.egg?
+      pbDisplay(_INTL("You cannot rename an egg!"))
+      return
+    end
+
     speciesname = PBSpecies.getName(pokemon.species)
     hasNickname = speciesname == pokemon.name
     if hasNickname
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index b931c0338..90f43fcfd 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index ec292660a..acaa59516 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ