diff --git a/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb b/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
index f6274c7b0..3ab4c5edf 100644
--- a/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
+++ b/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
@@ -41,7 +41,7 @@ end
 
 
 class Spriteset_Map
-  alias _animationSprite_initialize initialize unless method_defined?(:_animationSprite_initialize)
+  alias _animationSprite_initialize initialize unless private_method_defined?(:_animationSprite_initialize)
   alias _animationSprite_update update unless method_defined?(:_animationSprite_update)
   alias _animationSprite_dispose dispose unless method_defined?(:_animationSprite_dispose)
 
diff --git a/Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb b/Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb
index 0f6d56eb8..b48e7e15c 100644
--- a/Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb
+++ b/Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb
@@ -123,7 +123,7 @@ end
 # ? CLASS Sprite_Character edit
 #===================================================
 class Sprite_Character < RPG::Sprite
-  alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
+  alias shadow_initialize initialize unless private_method_defined?(:shadow_initialize)
 
   def initialize(viewport, character = nil)
     @ombrelist = []
@@ -178,7 +178,7 @@ end
 class Spriteset_Map
   attr_accessor :shadows
 
-  alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
+  alias shadow_initialize initialize unless private_method_defined?(:shadow_initialize)
 
   def initialize(map = nil)
     @shadows = []
diff --git a/Data/Scripts/005_Sprites/010_ParticleEngine.rb b/Data/Scripts/005_Sprites/010_ParticleEngine.rb
index 01037b8ed..1f8aefe21 100644
--- a/Data/Scripts/005_Sprites/010_ParticleEngine.rb
+++ b/Data/Scripts/005_Sprites/010_ParticleEngine.rb
@@ -566,7 +566,7 @@ end
 class Game_Event < Game_Character
   attr_accessor :pe_refresh
 
-  alias nf_particles_game_map_initialize initialize unless method_defined?(:nf_particles_game_map_initialize)
+  alias nf_particles_game_map_initialize initialize unless private_method_defined?(:nf_particles_game_map_initialize)
 
   def initialize(map_id, event, map = nil)
     @pe_refresh = false
diff --git a/Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb b/Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb
index 21488ac4e..ce78e38b5 100644
--- a/Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb	
+++ b/Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb	
@@ -172,7 +172,7 @@ end
 class Battle::AI
   attr_accessor :battlePalace
 
-  alias _battlePalace_initialize initialize unless method_defined?(:_battlePalace_initialize)
+  alias _battlePalace_initialize initialize unless private_method_defined?(:_battlePalace_initialize)
 
   def initialize(*arg)
     _battlePalace_initialize(*arg)
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
index 5feac96e5..85513cff0 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
@@ -710,11 +710,23 @@ MultipleForms.register(:CALYREX, {
       :ASTRALBARRAGE   # Shadow Rider (with Spectrier) (form 2)
     ]
     if form == 0   # Normal
+      # Forget special form moves
       form_moves.each do |move|
         next if !pkmn.hasMove?(move)
         pkmn.forget_move(move)
         pbMessage(_INTL("{1} forgot {2}...", pkmn.name, GameData::Move.get(move).name))
       end
+      # Forget all other moves not accessible to the base form
+      sp_data = pkmn.species_data
+      pkmn.moves.each_with_index do |move, i|
+        next if sp_data.moves.any? { |learn_move| learn_move[1] == move.id }
+        next if sp_data.tutor_moves.include?(move.id)
+        next if sp_data.egg_moves.include?(move.id)
+        pbMessage(_INTL("{1} forgot {2}...", pkmn.name, move.name))
+        pkmn.moves[i] = nil
+      end
+      pkmn.moves.compact!
+      # Ensure pkmn has at least one move in the end
       pbLearnMove(pkmn, :CONFUSION) if pkmn.numMoves == 0
     else   # Ice Rider, Shadow Rider
       new_move = form_moves[form - 1]
diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb
index 8a73206e2..d9094e59f 100644
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb
@@ -496,7 +496,6 @@ class PokemonMart_Scene
           curnumber = maximum if curnumber < 1
           numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
         elsif Input.trigger?(Input::USE)
-          pbPlayDecisionSE
           ret = curnumber
           break
         elsif Input.trigger?(Input::BACK)
diff --git a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
index 4033c99c4..fcfa54338 100644
--- a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
+++ b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
@@ -5,7 +5,7 @@ class Player < Trainer
   attr_accessor :has_snag_machine
   attr_accessor :seen_purify_chamber
 
-  alias __shadowPkmn__initialize initialize unless method_defined?(:__shadowPkmn__initialize)
+  alias __shadowPkmn__initialize initialize unless private_method_defined?(:__shadowPkmn__initialize)
   def initialize(name, trainer_type)
     __shadowPkmn__initialize(name, trainer_type)
     @has_snag_machine    = false