diff --git a/Data/Map363.rxdata b/Data/Map363.rxdata
index 0bc59c2fe..783cb82c1 100644
Binary files a/Data/Map363.rxdata and b/Data/Map363.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index b7b6d86c1..4bc115022 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
index 16e92671b..d976db834 100644
--- a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
+++ b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
@@ -189,6 +189,10 @@ class PokeBattle_Battler
   end
   alias isShiny? shiny?
 
+  def glitter?
+    return @pokemon.glitter
+  end
+
   def owned?
     return false if !@battle.wildBattle?
     return $Trainer.owned?(displaySpecies)
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 11dc06775..f07780a22 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	
@@ -129,8 +129,10 @@ class PokeBattle_Scene
     sendOutAnims.each { |a| a[0].dispose; a[1].dispose }
     # Play shininess animations for shiny Pokémon
     sendOuts.each do |b|
-      next if !@battle.showAnims || !@battle.battlers[b[0]].shiny?
-      pbCommonAnimation("Shiny",@battle.battlers[b[0]])
+      next if !@battle.showAnims ||
+        if @battle.battlers[b[0]].shiny? || @battle.battlers[b[0]].glitter?
+          pbCommonAnimation("Shiny",@battle.battlers[b[0]])
+        end
     end
   end
 
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 4d1e48e8e..e40ed84d2 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -31,6 +31,7 @@ class Pokemon
   # This Pokémon's shininess (true, false, nil). Is recalculated if made nil.
   # @param value [Boolean, nil] whether this Pokémon is shiny
   #attr_writer :shiny
+  attr_accessor :glitter
   attr_accessor :head_shiny
   attr_accessor :body_shiny
   attr_accessor :debug_shiny
@@ -1221,7 +1222,7 @@ class Pokemon
     @ivMaxed = {}
     @ev = {}
     @hiddenPowerType = nil
-
+    @glitter=nil
     GameData::Stat.each_main do |s|
       @iv[s.id] = rand(IV_STAT_LIMIT + 1)
       @ev[s.id] = 0
diff --git a/Data/Scripts/050_AddOns/New Balls.rb b/Data/Scripts/050_AddOns/New Balls.rb
index f81c1adb4..cfa29a3e8 100644
--- a/Data/Scripts/050_AddOns/New Balls.rb	
+++ b/Data/Scripts/050_AddOns/New Balls.rb	
@@ -50,7 +50,7 @@ BallHandlers::ModifyCatchRate.add(:SHINYBALL,proc{|ball,catchRate,battle,pokemon
 next catchRate
 })
 BallHandlers::OnCatch.add(:SHINYBALL,proc{|ball,battle,pokemon|
-  pokemon.makeShiny
+  pokemon.glitter=true
 })
 
 #PERFECTBALL 29
diff --git a/Data/System.rxdata b/Data/System.rxdata
index b0aadc1d2..9e1e8ea88 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ