diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 648249420..d6f6f54b6 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -93,6 +93,11 @@ module Settings
   # whether the machine's move retains the replaced move's PP (true), or whether
   # the machine's move has full PP (false).
   TAUGHT_MACHINES_KEEP_OLD_PP          = (MECHANICS_GENERATION == 5)
+  # Whether the Move Relearner can also teach egg moves that the Pokémon knew
+  # when it hatched and moves that the Pokémon was once taught by a TR. Moves
+  # from the Pokémon's level-up moveset of the same or a lower level than the
+  # Pokémon can always be relearned.
+  MOVE_RELEARNER_CAN_TEACH_MORE_MOVES  = (MECHANICS_GENERATION >= 6)
   # Whether various HP-healing items heal the amounts they do in Gen 7+ (true)
   # or in earlier Generations (false).
   REBALANCED_HEALING_ITEM_AMOUNTS      = (MECHANICS_GENERATION >= 7)
diff --git a/Data/Scripts/016_UI/021_UI_MoveRelearner.rb b/Data/Scripts/016_UI/021_UI_MoveRelearner.rb
index 39d512c54..837c6b036 100644
--- a/Data/Scripts/016_UI/021_UI_MoveRelearner.rb
+++ b/Data/Scripts/016_UI/021_UI_MoveRelearner.rb
@@ -154,13 +154,13 @@ class MoveRelearnerScreen
       next if m[0] > pkmn.level || pkmn.hasMove?(m[1])
       moves.push(m[1]) if !moves.include?(m[1])
     end
-    tmoves = []
-    if pkmn.first_moves
+    if Settings::MOVE_RELEARNER_CAN_TEACH_MORE_MOVES && pkmn.first_moves
+      tmoves = []
       pkmn.first_moves.each do |i|
-        tmoves.push(i) if !pkmn.hasMove?(i) && !moves.include?(i)
+        tmoves.push(i) if !moves.include?(i) && !pkmn.hasMove?(i)
       end
+      moves = tmoves + moves   # List first moves before level-up moves
     end
-    moves = tmoves + moves
     return moves | []   # remove duplicates
   end
 
diff --git a/PBS/trainer_types.txt b/PBS/trainer_types.txt
index fd9f45934..d414097af 100644
--- a/PBS/trainer_types.txt
+++ b/PBS/trainer_types.txt
@@ -397,5 +397,5 @@ VictoryME = Battle victory leader
 Name = Champion
 Gender = Male
 BaseMoney = 100
-BattleBGM = Battle Elite
+BattleBGM = Battle Champion
 VictoryME = Battle victory leader