diff --git a/Data/Map472.rxdata b/Data/Map472.rxdata
index 9298885a4..bd676b0f2 100644
Binary files a/Data/Map472.rxdata and b/Data/Map472.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index f8aca715f..9b83586f7 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 70c676588..e363778c9 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -77,6 +77,8 @@ module Settings
   # The default screen scale factor. Possible values are 0.5, 1.0, 1.5 and 2.0.
   SCREEN_SCALE = 1.0
 
+  FADEOUT_SPEED = 0.2
+
   #=============================================================================
 
   # The maximum level Pokémon can reach.
diff --git a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb
index e6d453204..2539a95c1 100644
--- a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb	
+++ b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb	
@@ -560,7 +560,7 @@ def pbFadeOutIn(z=99999,nofadeout=false)
   col=Color.new(0,0,0,0)
   viewport=Viewport.new(0,0,Graphics.width,Graphics.height)
   viewport.z=z
-  numFrames = (Graphics.frame_rate*0.4).floor
+  numFrames = (Graphics.frame_rate*Settings::FADEOUT_SPEED).floor
   alphaDiff = (255.0/numFrames).ceil
   for j in 0..numFrames
     col.set(0,0,0,j*alphaDiff)
@@ -589,7 +589,7 @@ def pbFadeOutInWithUpdate(z,sprites,nofadeout=false)
   col=Color.new(0,0,0,0)
   viewport=Viewport.new(0,0,Graphics.width,Graphics.height)
   viewport.z=z
-  numFrames = (Graphics.frame_rate*0.4).floor
+  numFrames = (Graphics.frame_rate*Settings::FADEOUT_SPEED).floor
   alphaDiff = (255.0/numFrames).ceil
   for j in 0..numFrames
     col.set(0,0,0,j*alphaDiff)
@@ -634,7 +634,7 @@ end
 
 def pbFadeOutAndHide(sprites)
   visiblesprites = {}
-  numFrames = (Graphics.frame_rate*0.4).floor
+  numFrames = (Graphics.frame_rate*Settings::FADEOUT_SPEED).floor
   alphaDiff = (255.0/numFrames).ceil
   pbDeactivateWindows(sprites) {
     for j in 0..numFrames
@@ -659,7 +659,7 @@ def pbFadeInAndShow(sprites,visiblesprites=nil)
       end
     end
   end
-  numFrames = (Graphics.frame_rate*0.4).floor
+  numFrames = (Graphics.frame_rate*Settings::FADEOUT_SPEED).floor
   alphaDiff = (255.0/numFrames).ceil
   pbDeactivateWindows(sprites) {
     for j in 0..numFrames
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 5f3144162..7aaeec45b 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ