diff --git a/Data/Map444.rxdata b/Data/Map444.rxdata
index e1e2ac4b5..a9b416fce 100644
Binary files a/Data/Map444.rxdata and b/Data/Map444.rxdata differ
diff --git a/Data/Map561.rxdata b/Data/Map561.rxdata
index 712f95405..e1c8f8e62 100644
Binary files a/Data/Map561.rxdata and b/Data/Map561.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 98bae35ae..a60450dcb 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/004_Game classes/003_Game_Picture.rb b/Data/Scripts/004_Game classes/003_Game_Picture.rb
index 6fe8ba678..4747db05a 100644
--- a/Data/Scripts/004_Game classes/003_Game_Picture.rb	
+++ b/Data/Scripts/004_Game classes/003_Game_Picture.rb	
@@ -10,7 +10,7 @@ class Game_Picture
   # * Public Instance Variables
   #-----------------------------------------------------------------------------
   attr_reader   :number                   # picture number
-  attr_reader   :name                     # file name
+  attr_accessor  :name                     # file name
   attr_reader   :origin                   # starting point
   attr_reader   :x                        # x-coordinate
   attr_reader   :y                        # y-coordinate
diff --git a/Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb b/Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb
index 8dc913198..a6f99a76f 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb	
@@ -115,7 +115,7 @@ class PokeBattle_Scene
         break if yield cw.index
         needFullRefresh = true
         needRefresh = true
-      elsif Input.trigger?(Input::BACK)   # Cancel fight menu
+      elsif Input.trigger?(Input::ACTION)  # Cancel fight menu
         pbPlayCancelSE
         break if yield -1
         needRefresh = true
diff --git a/Data/Scripts/050_AddOns/Autosave.rb b/Data/Scripts/050_AddOns/Autosave.rb
index d44a8c3ea..31167dbab 100644
--- a/Data/Scripts/050_AddOns/Autosave.rb
+++ b/Data/Scripts/050_AddOns/Autosave.rb
@@ -19,9 +19,9 @@ def pbSetPokemonCenter
 end
 
 def Kernel.Autosave
-  Game.auto_save
+  #Game.auto_save
   #showSaveIcon()
-  # pbSave(false)
+   pbSave(false)
   # #hideSaveIcon()
 end
 
diff --git a/Data/Scripts/050_AddOns/IntroScreen.rb b/Data/Scripts/050_AddOns/IntroScreen.rb
index acf5a968b..df26c027b 100644
--- a/Data/Scripts/050_AddOns/IntroScreen.rb
+++ b/Data/Scripts/050_AddOns/IntroScreen.rb
@@ -15,10 +15,25 @@ class Scene_Intro
 
   alias main_old main
 
+  def playIntroCinematic
+    intro_frames_path = "Graphics\\Pictures\\Intro\\INTRO-%03d"
+    intro_bgm = "INTRO_music_cries"
+    intro_movie = Movie.new(intro_frames_path,intro_bgm,230,true)
+    intro_movie.playInViewPort(@viewport)
+    while(!intro_movie.finished)
+      echo intro_movie.finished
+      echo "\n"
+      wait(8)
+    end
+  end
+
   def main
     Graphics.transition(0)
     # Cycles through the intro pictures
     @skip = false
+
+
+    playIntroCinematic
     # Selects title screen style
     @screen = GenOneStyle.new
     # Plays the title screen intro (is skippable)
diff --git a/Data/Scripts/050_AddOns/Movie.rb b/Data/Scripts/050_AddOns/Movie.rb
new file mode 100644
index 000000000..2520eb715
--- /dev/null
+++ b/Data/Scripts/050_AddOns/Movie.rb
@@ -0,0 +1,89 @@
+class Movie
+  attr_reader :finished
+
+  def initialize(framesPath, bgm, maxFrame = 1000, canStopEarly=false)
+    @currentFrame = 1
+    @initialTime = nil
+    @timeElapsed = nil
+    @maxFrame = maxFrame
+    @framesPath = framesPath
+    @bgm = bgm
+    @canStopEarly = canStopEarly
+    @finished=false
+  end
+
+  def play(imageNumber = 12)
+    @finished=false
+    @currentFrame = 1
+    @initialTime = Time.now
+    @timeElapsed = Time.now
+
+    pbBGMPlay(@bgm)
+    while (@currentFrame <= @maxFrame)# && !(@canStopEarly && Input::ACTION))
+      if Input.trigger?(Input::C)
+        echo "bruh"
+        echo "\n"
+
+      end
+      frame = sprintf(@framesPath, @currentFrame)
+      picture = Game_Picture.new(imageNumber)
+      picture.show(frame, 0, 0, 0, 100, 100, 255, 0)
+      pbWait(Graphics.frame_rate / 20)
+      picture.erase
+      @currentFrame += 1
+    end
+    @finished=true
+    pbBGMStop
+  end
+
+  def playInViewPort(viewport)
+    @finished=false
+    @currentFrame = 1
+    @initialTime = Time.now
+    @timeElapsed = Time.now
+
+    pbBGMPlay(@bgm)
+    while (@currentFrame <= @maxFrame)# && !(@canStopEarly && Input::ACTION))
+      Input.update
+      if Input.trigger?(Input::C)
+        echo "bruh"
+        echo "\n"
+
+      end
+      break if Input.trigger?(Input::ACTION) && @canStopEarly
+      frame = sprintf(@framesPath, @currentFrame)
+      picture = Sprite.new(viewport)
+      picture.bitmap = pbBitmap(frame)
+      picture.visible=true
+      pbWait(Graphics.frame_rate / 20)
+      picture.dispose
+      @currentFrame += 1
+    end
+    @finished=true
+    pbBGMStop
+  end
+
+  # not really necessary I think
+  def pbAutoregulador()
+    hora_inicio = $game_variables[VARIABLE_TIME_INITIAL]
+    hora_actual = Time.now
+    diferencia = (hora_actual - hora_inicio) * 20 #20 frames corresponde a 1 seg
+    #Redondeo
+    diferencia_entera = diferencia.to_i
+
+    diferencia_entera = diferencia_entera.to_f
+
+    if diferencia - diferencia_entera >= 0.5
+      diferencia_entera = diferencia_entera + 1
+    end
+
+    $game_variables[VARIABLE_CURRENT_FRAME] = diferencia_entera.to_int
+
+    $game_variables[VARIABLE_TIME_ELAPSED] = Time.now
+
+    return $game_variables[VARIABLE_CURRENT_FRAME]
+  end
+
+end
+
+def pbPlayMovie(framesPath, bgm, maxFrame = 1000, imageNumber = 12) end
\ No newline at end of file
diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb
index 257b0cbf1..4e2941e8a 100644
--- a/Data/Scripts/999_Main/999_Main.rb
+++ b/Data/Scripts/999_Main/999_Main.rb
@@ -9,7 +9,7 @@ class Scene_DebugIntro
 end
 
 def pbCallTitle
-  return Scene_DebugIntro.new if $DEBUG
+  # return Scene_DebugIntro.new if $DEBUG
   return Scene_Intro.new
 end
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index c8bc5ccb8..681356e1b 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 211adbc66..0fb4b06ab 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/town_map.dat b/Data/town_map.dat
index 286d06be7..feef78a4b 100644
Binary files a/Data/town_map.dat and b/Data/town_map.dat differ
diff --git a/PBS/townmap.txt b/PBS/townmap.txt
index 9f1ba2b75..6cd087472 100644
--- a/PBS/townmap.txt
+++ b/PBS/townmap.txt
@@ -190,7 +190,7 @@ Point=23,18,"Kindle Road",,,,,
 Point=23,17,"Mt. Ember",,,,,
 Point=23,17,"Mt. Ember",,,,,
 
-Point=23,25,"Battle Factory",,559,46,74,802
+Point=23,25,"Battle Factory",,734,10,11,802
 
 Point=23,21,"Brine Road",,,,,
 Point=23,22,"Brine Road",,,,,