Update 6.8

Data/Scripts/003_Game processing/001_StartGame.rb

@@ -17,7 +17,7 @@ module Game
     GameData.load_all
     map_file = format('Data/Map%03d.rxdata', $data_system.start_map_id)
     if $data_system.start_map_id == 0 || !pbRgssExists?(map_file)
-      raise _INTL('No starting position was set in the map editor.')
+      raise _INTL("No starting position was set in the map editor.")
     end
   end
 
@@ -105,9 +105,9 @@ module Game
     # Set resize factor
     pbSetResizeFactor([$PokemonSystem.screensize, 4].min)
     # Set language (and choose language if there is no save file)
-    if Settings::LANGUAGES.length >= 2
+    if Settings::LANGUAGES[Settings::GAME_ID].length >= 2
       $PokemonSystem.language = pbChooseLanguage if save_data.empty?
-      pbLoadMessages('Data/' + Settings::LANGUAGES[$PokemonSystem.language][1])
+      pbLoadMessages('Data/' + Settings::LANGUAGES[Settings::GAME_ID][$PokemonSystem.language][1])
     end
   end
 
@@ -126,8 +126,8 @@ module Game
             pokemon.exp_when_fused_body=nil
             pokemon.exp_gained_since_fused=nil
             pokemon.level = 5
+            pokemon.pif_sprite =nil
 
-            echoln pokemon.owner.id
             pokemon.owner.id = $Trainer.id
             pokemon.ot=$Trainer.name
             pokemon.obtain_method = 0
@@ -217,13 +217,13 @@ module Game
         $MapFactory.setup($game_map.map_id)
       rescue Errno::ENOENT
         if $DEBUG
-          pbMessage(_INTL('Map {1} was not found.', $game_map.map_id))
+          pbMessage(_INTL("Map {1} was not found.", $game_map.map_id))
           map = pbWarpToMapList
           exit unless map
           $MapFactory.setup(map[0])
           $game_player.moveto(map[1], map[2])
         else
-          raise _INTL('The map was not found. The game cannot continue.')
+          raise _INTL("The map was not found. The game cannot continue.")
         end
       end
       $game_player.center($game_player.x, $game_player.y)
@@ -231,7 +231,7 @@ module Game
       $MapFactory.setMapChanged($game_map.map_id)
     end
     if $game_map.events.nil?
-      raise _INTL('The map is corrupt. The game cannot continue.')
+      raise _INTL("The map is corrupt. The game cannot continue.")
     end
     $PokemonEncounters = PokemonEncounters.new
     $PokemonEncounters.setup($game_map.map_id)

Data/Scripts/003_Game processing/002_Scene_Map.rb

@@ -94,9 +94,10 @@ class Scene_Map
     $game_temp.player_transferring = false
     pbCancelVehicles($game_temp.player_new_map_id) if cancelVehicles
     autofade($game_temp.player_new_map_id)
-    pbBridgeOff
+    #pbBridgeOff
     @spritesetGlobal.playersprite.clearShadows
     clear_quest_icons()
+    update_last_visited_location
     if $game_map.map_id != $game_temp.player_new_map_id
       $MapFactory.setup($game_temp.player_new_map_id)
     end
@@ -128,6 +129,17 @@ class Scene_Map
     Input.update
   end
 
+  def update_last_visited_location
+    old_map = $game_map.map_id
+    mapdata = pbLoadTownMapData
+    all_maps = mapdata[0][2]
+    if find_position_for_map(all_maps,old_map)
+      $Trainer.last_visited_town_map_location = old_map
+    end
+  end
+
+
+
   def call_menu
     $game_temp.menu_calling = false
     $game_temp.in_menu = true
@@ -190,6 +202,14 @@ class Scene_Map
     Events.onMapUpdate.trigger(self)
   end
 
+  def showLocationWindow
+    dayOfWeek = getDayOfTheWeekName()
+    location_window_text = pbGetMapNameFromId($game_map.map_id)
+    location_window_text += "\n"+ pbGetTimeNow.strftime(_INTL("%I:%M %p"))# unless $game_switches[SWITCH_TIME_PAUSED]
+    location_window_text += "\n"+ dayOfWeek
+    $scene.spriteset.addUserSprite(LocationWindow.new(location_window_text))
+  end
+
   def update
     loop do
       pbMapInterpreter.update
@@ -230,8 +250,7 @@ class Scene_Map
         unless $game_system.menu_disabled || $game_player.moving?
           $game_temp.menu_calling = true
           $game_temp.menu_beep = true
-          dayOfWeek = getDayOfTheWeek().to_s
-          $scene.spriteset.addUserSprite(LocationWindow.new($game_map.name+ "\n"+ pbGetTimeNow.strftime(_INTL("%I:%M %p")) + "\n" + dayOfWeek))
+          showLocationWindow
         end
       elsif Input.trigger?(Input::SPECIAL)
         unless $game_system.menu_disabled || $game_player.moving?
@@ -260,6 +279,8 @@ class Scene_Map
 
   def reset_player_sprite
     @spritesetGlobal.playersprite.updateBitmap
+    updateSpritesets
+    refreshPlayerOutfit
   end
 
   def reset_map(fadeout = false,reset_music=true)
@@ -269,12 +290,14 @@ class Scene_Map
     $game_map.update
     disposeSpritesets
     GC.start
+    $PokemonTemp.dependentEvents = nil
     createSpritesets
     if fadeout
       $game_temp.transition_processing = false
       Graphics.transition(20)
     end
     $game_map.autoplay if reset_music
+    clearOverworldPokemon
     Graphics.frame_reset
     Input.update
   end

Data/Scripts/003_Game processing/004_Interpreter_Commands.rb

@@ -211,7 +211,11 @@ class Interpreter
   #-----------------------------------------------------------------------------
   def command_102
     @message_waiting = true
-    command = pbShowCommands(nil, @list[@index].parameters[0], @list[@index].parameters[1])
+    cmd_texts = []
+    for cmd in @list[@index].parameters[0]
+      cmd_texts.push(_MAPINTL($game_map.map_id, cmd))
+    end
+    command = pbShowCommands(nil, cmd_texts, @list[@index].parameters[1])
     @message_waiting = false
     @branch[@list[@index].indent] = command
     Input.update   # Must call Input.update again to avoid extra triggers