diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 16e73e2f8..892f8ef3e 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -292,7 +292,7 @@ module Settings
       31 => [2, 21,     69],
       69 => [   21, 31    ]
     }],
-    [:ENTEI, 40, 55, 1, nil]
+    [:ENTEI, 40, 55, 1]
   ]
 
   #=============================================================================
diff --git a/Data/Scripts/001_Technical/001_Debugging/002_DebugConsole.rb b/Data/Scripts/001_Technical/001_Debugging/002_DebugConsole.rb
index 45884ec35..9b382213b 100644
--- a/Data/Scripts/001_Technical/001_Debugging/002_DebugConsole.rb
+++ b/Data/Scripts/001_Technical/001_Debugging/002_DebugConsole.rb
@@ -14,7 +14,6 @@ module Console
     echoln ""
     echoln "Closing this window will close the game. If you want to get rid of this window,"
     echoln "run the program from the Shell, or download a release version of the game."
-    echoln ""
     echoln "-------------------------------------------------------------------------------"
     echoln "Debug Output:"
     echoln "-------------------------------------------------------------------------------"
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb
index 8992996a5..8ec2ad58c 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb	
@@ -77,14 +77,9 @@ def pbRoamPokemonOne(idxRoamer)
   newMapChoices = []
   nextMaps = pbRoamingAreas(idxRoamer)[currentMap]
   return if !nextMaps
-  nextMaps.each do |map|
-    # Only add map as a choice if the player hasn't been there recently
-    newMapChoices.push(map)
-  end
+  nextMaps.each { |map| newMapChoices.push(map) }
   # Rarely, add a random possible map into the mix
-  if rand(32) == 0
-    newMapChoices.push(mapIDs[rand(mapIDs.length)])
-  end
+  newMapChoices.push(mapIDs[rand(mapIDs.length)]) if rand(32) == 0
   # Choose a random new map to roam to
   if newMapChoices.length > 0
     $PokemonGlobal.roamPosition[idxRoamer] = newMapChoices[rand(newMapChoices.length)]
diff --git a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
index 1c64d9519..b206e8ffa 100644
--- a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
+++ b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb
@@ -195,7 +195,7 @@ module Compiler
         f.write("Type = #{move.type}\r\n")
         category = GameData::Move::SCHEMA["Category"][2][move.category]
         f.write("Category = #{category}\r\n")
-        f.write("BaseDamage = #{move.base_damage}\r\n") if move.base_damage > 0
+        f.write("Power = #{move.base_damage}\r\n") if move.base_damage > 0
         f.write("Accuracy = #{move.accuracy}\r\n")
         f.write("TotalPP = #{move.total_pp}\r\n")
         f.write("Target = #{move.target}\r\n")