diff --git a/Data/Map015.rxdata b/Data/Map015.rxdata
index 9a4f7292e..50076074e 100644
Binary files a/Data/Map015.rxdata and b/Data/Map015.rxdata differ
diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata
index 23bdd37dd..2d7ea7b15 100644
Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ
diff --git a/Data/Map063.rxdata b/Data/Map063.rxdata
index 418d1461d..4e6f974fa 100644
Binary files a/Data/Map063.rxdata and b/Data/Map063.rxdata differ
diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index 0455056a9..dd0429bab 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/Map083.rxdata b/Data/Map083.rxdata
index dc0fc5b66..d0b514954 100644
Binary files a/Data/Map083.rxdata and b/Data/Map083.rxdata differ
diff --git a/Data/Map148.rxdata b/Data/Map148.rxdata
index 450639593..b71634c6b 100644
Binary files a/Data/Map148.rxdata and b/Data/Map148.rxdata differ
diff --git a/Data/Map186.rxdata b/Data/Map186.rxdata
index 6ff72ab9c..3e2e93754 100644
Binary files a/Data/Map186.rxdata and b/Data/Map186.rxdata differ
diff --git a/Data/Map260.rxdata b/Data/Map260.rxdata
index ce26059ce..6efcf2180 100644
Binary files a/Data/Map260.rxdata and b/Data/Map260.rxdata differ
diff --git a/Data/Map265.rxdata b/Data/Map265.rxdata
index 44ef47736..41393fec2 100644
Binary files a/Data/Map265.rxdata and b/Data/Map265.rxdata differ
diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata
index f3d7c6f3e..5b4ea64d5 100644
Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ
diff --git a/Data/Map300.rxdata b/Data/Map300.rxdata
index 36bf342a9..1839c9244 100644
Binary files a/Data/Map300.rxdata and b/Data/Map300.rxdata differ
diff --git a/Data/Map337.rxdata b/Data/Map337.rxdata
index a5896cc4a..4d53a85db 100644
Binary files a/Data/Map337.rxdata and b/Data/Map337.rxdata differ
diff --git a/Data/Map363.rxdata b/Data/Map363.rxdata
index a279a3dd3..a0dfc79dc 100644
Binary files a/Data/Map363.rxdata and b/Data/Map363.rxdata differ
diff --git a/Data/Map377.rxdata b/Data/Map377.rxdata
index 3a99bc461..4d3912eec 100644
Binary files a/Data/Map377.rxdata and b/Data/Map377.rxdata differ
diff --git a/Data/Map430.rxdata b/Data/Map430.rxdata
index b748164fa..2fa783b2d 100644
Binary files a/Data/Map430.rxdata and b/Data/Map430.rxdata differ
diff --git a/Data/Map458.rxdata b/Data/Map458.rxdata
index 49554a754..9dd8da667 100644
Binary files a/Data/Map458.rxdata and b/Data/Map458.rxdata differ
diff --git a/Data/Map524.rxdata b/Data/Map524.rxdata
index f9e36256a..49f3f2be0 100644
Binary files a/Data/Map524.rxdata and b/Data/Map524.rxdata differ
diff --git a/Data/Map529.rxdata b/Data/Map529.rxdata
index b445e4e11..89b129dfb 100644
Binary files a/Data/Map529.rxdata and b/Data/Map529.rxdata differ
diff --git a/Data/Map551.rxdata b/Data/Map551.rxdata
index 7323b4b25..768d926cd 100644
Binary files a/Data/Map551.rxdata and b/Data/Map551.rxdata differ
diff --git a/Data/Map552.rxdata b/Data/Map552.rxdata
index 5d8c85c66..234197652 100644
Binary files a/Data/Map552.rxdata and b/Data/Map552.rxdata differ
diff --git a/Data/Map562.rxdata b/Data/Map562.rxdata
index d166bd197..392c4e9ed 100644
Binary files a/Data/Map562.rxdata and b/Data/Map562.rxdata differ
diff --git a/Data/Map593.rxdata b/Data/Map593.rxdata
index fe763e0e8..e217804d9 100644
Binary files a/Data/Map593.rxdata and b/Data/Map593.rxdata differ
diff --git a/Data/Map603.rxdata b/Data/Map603.rxdata
index b27703d4d..4dd9efce4 100644
Binary files a/Data/Map603.rxdata and b/Data/Map603.rxdata differ
diff --git a/Data/Map625.rxdata b/Data/Map625.rxdata
index 65d1981bc..1cf0e8f51 100644
Binary files a/Data/Map625.rxdata and b/Data/Map625.rxdata differ
diff --git a/Data/Map647.rxdata b/Data/Map647.rxdata
index b676db16a..1a6c049f1 100644
Binary files a/Data/Map647.rxdata and b/Data/Map647.rxdata differ
diff --git a/Data/Map648.rxdata b/Data/Map648.rxdata
index dfe1aaffd..da1a0d431 100644
Binary files a/Data/Map648.rxdata and b/Data/Map648.rxdata differ
diff --git a/Data/Map659.rxdata b/Data/Map659.rxdata
index 66bca09eb..bcb897f91 100644
Binary files a/Data/Map659.rxdata and b/Data/Map659.rxdata differ
diff --git a/Data/Map724.rxdata b/Data/Map724.rxdata
index 7e6a9be1d..c4d5a2d6d 100644
Binary files a/Data/Map724.rxdata and b/Data/Map724.rxdata differ
diff --git a/Data/Map734.rxdata b/Data/Map734.rxdata
index 3e337dae8..aa73998ee 100644
Binary files a/Data/Map734.rxdata and b/Data/Map734.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ba0fa57f5..5d5c0e2a2 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb b/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb
index 07249ebc0..3ce43cbf2 100644
--- a/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb	
+++ b/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb	
@@ -97,18 +97,26 @@ class AnimatedBitmap
     @bitmap.bitmap = new_bitmap
   end
 
-  def mirror
-    for x in 0..@bitmap.bitmap.width / 2
-      for y in 0..@bitmap.bitmap.height - 2
-        temp = @bitmap.bitmap.get_pixel(x, y)
-        newPix = @bitmap.bitmap.get_pixel((@bitmap.bitmap.width - x), y)
+  # def mirror
+  #   for x in 0..@bitmap.bitmap.width / 2
+  #     for y in 0..@bitmap.bitmap.height - 2
+  #       temp = @bitmap.bitmap.get_pixel(x, y)
+  #       newPix = @bitmap.bitmap.get_pixel((@bitmap.bitmap.width - x), y)
+  #
+  #       @bitmap.bitmap.set_pixel(x, y, newPix)
+  #       @bitmap.bitmap.set_pixel((@bitmap.bitmap.width - x), y, temp)
+  #     end
+  #   end
+  # end
 
-        @bitmap.bitmap.set_pixel(x, y, newPix)
-        @bitmap.bitmap.set_pixel((@bitmap.bitmap.width - x), y, temp)
-      end
-    end
+
+  def mirror
+    @bitmap.bitmap
   end
 
+
+
+
 end
 
 #===============================================================================
diff --git a/Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb b/Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb
index 8062535c2..5fbda46f4 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/006_PokeBattle_Scene.rb	
@@ -322,6 +322,7 @@ class PokeBattle_Scene
     back = !@battle.opposes?(idxBattler)
     shadowSprite.setPokemonBitmap(pkmn)
     pkmnSprite.setPokemonBitmap(pkmn,back)
+    pkmnSprite.mirror=true if back
     # Set visibility of battler's shadow
     shadowSprite.visible = pkmn.species_data.shows_shadow? if shadowSprite && !back
   end
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index 56559cd4f..8e0bf47d2 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -612,7 +612,7 @@ end
 def pbRockSmash
   move = :ROCKSMASH
   movefinder = $Trainer.get_pokemon_with_move(move)
-  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, false) || (!$DEBUG && !movefinder)
+  if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, false) || (!$DEBUG && !movefinder) || $PokemonBag.pbQuantity(:PICKAXE)>0
     pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it."))
     return false
   end
diff --git a/Data/Scripts/050_AddOns/New HMs.rb b/Data/Scripts/050_AddOns/New HMs.rb
new file mode 100644
index 000000000..b83433731
--- /dev/null
+++ b/Data/Scripts/050_AddOns/New HMs.rb	
@@ -0,0 +1,82 @@
+
+#===============================================================================
+# Rock Smash
+#===============================================================================
+
+
+def pbRockSmashRandomEncounter
+  if rand(100)<30
+    if pbEncounter(:RockSmash)
+      return
+    else
+      pbDefaultRockSmashEncounter(5,15)
+    end
+  else
+    rockSmashItem(false)
+  end
+end
+
+def pbDefaultRockSmashEncounter(minLevel,maxLevel)
+  level =rand((maxLevel-minLevel).abs)+minLevel
+  pbWildBattle(:GEODUDE,level)
+  return true
+end
+
+#FOR ROCK TUNNEL AND CERULEAN CAVE (+diamond)
+def pbRockSmashRandomEncounterSpecial
+  if rand(100)<35
+    pbEncounter(:RockSmash)
+  else
+    rockSmashItem(true)
+  end
+end
+
+def getRockSmashItemList(inclRareItems)
+  basicItems = [:ROCKGEM, :GROUNDGEM,:STEELGEM,
+                :HARDSTONE,:HARDSTONE,:HARDSTONE,:ROCKGEM,
+                :SMOOTHROCK,:STARDUST,:HEARTSCALE,:HEARTSCALE,
+                :HEARTSCALE,:SOFTSAND,:HEARTSCALE,:RAREBONE]
+
+  rareItems = [:RAREBONE,:STARDUST,:ETHER,
+               :REVIVE,:NUGGET,:DIAMOND]
+
+  fossilItems =    [:ROOTFOSSIL,:CLAWFOSSIL,:DOMEFOSSIL,:HELIXFOSSIL,
+                    :SKULLFOSSIL,:ARMORFOSSIL]
+
+  #            Kernel.pbMessage(inclRareItems.to_s)
+
+  itemsList = inclRareItems ? basicItems + basicItems + rareItems : basicItems
+
+  #beaten league
+  if $game_switches[12]
+    itemsList += fossilItems
+  end
+  return itemsList
+end
+
+def rockSmashItem(isDark=false)
+  chance = 50
+  if rand(100)< chance
+    itemsList = getRockSmashItemList(isDark)
+    i = rand(itemsList.length)
+    Kernel.pbItemBall(itemsList[i],1,nil,false)
+  end
+end
+
+
+#Used in underwater maps
+def pbRockSmashRandomEncounterDive
+  if rand(100)<25
+    pbEncounter(:RockSmash)
+  else
+    if rand(100)<20
+      itemsList = [:WATERGEM,:STEELGEM,
+                   :HEARTSCALE,:HEARTSCALE,:HARDSTONE,:ROCKGEM,
+                   :SMOOTHROCK,:WATERSTONE,:PEARL,:HEARTSCALE,
+                   :HEARTSCALE,:HEARTSCALE,:SHOALSHELL,:BIGPEARL]
+
+      i = rand(itemsList.length)
+      Kernel.pbItemBall(itemsList[i],1,nil,false)
+    end
+  end
+end
\ No newline at end of file
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 98dc9a82d..b55d7e996 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 1dae0915b..e7e2e70cb 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/trainers.dat b/Data/trainers.dat
index e8209f0b4..0b4fd6135 100644
Binary files a/Data/trainers.dat and b/Data/trainers.dat differ
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index ed9d50af2..e4f8b0213 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -1858,7 +1858,8 @@ Pokemon = GYARADOS,40
 #Rocket blocking Saffron
 
 [TEAMROCKET_M,Dennis]
-Pokemon = B84H20,38 
+Pokemon = B84H20,38
+Pokemon = B24H42,38 
 ##########################
 #Rocket bully