Tidied, fixed some bugs

Data/Scripts/017_UI/004_PScreen_PokedexEntry.rb

@@ -300,7 +300,7 @@ class PokemonPokedexInfo_Scene
     mapwidth = 1+PokemonRegionMap_Scene::RIGHT-PokemonRegionMap_Scene::LEFT
     GameData::Encounter.each_of_version($PokemonGlobal.encounter_version) do |enc_data|
       next if !pbFindEncounter(enc_data.types, @species)
-      map_metadata = GameData::MapMetadata.try_get(enc_data.id)
+      map_metadata = GameData::MapMetadata.try_get(enc_data.map)
       mappos = (map_metadata) ? map_metadata.town_map_position : nil
       next if !mappos || mappos[0] != @region
       showpoint = true

Data/Scripts/017_UI/006_PScreen_Summary.rb

@@ -819,7 +819,7 @@ class PokemonSummary_Scene
     if selected_move.accuracy == 0
       textpos.push(["---", 216, 186, 1, base, shadow])
     else
-      textpos.push([sprintf("%d%", selected_move.accuracy), 216 + overlay.text_size("%").width, 186, 1, base, shadow])
+      textpos.push(["#{selected_move.accuracy}%", 216 + overlay.text_size("%").width, 186, 1, base, shadow])
     end
     # Draw all text
     pbDrawTextPositions(overlay, textpos)

Data/Scripts/017_UI/013_PScreen_Load.rb

@@ -223,7 +223,6 @@ class PokemonLoadScreen
   # @return [Hash] save data
   def load_save_file(file_path)
     save_data = SaveData.read_from_file(file_path)
-
     unless SaveData.valid?(save_data)
       if File.file?(file_path + '.bak')
         pbMessage(_INTL('The save file is corrupt. A backup will be loaded.'))
@@ -233,7 +232,6 @@ class PokemonLoadScreen
         return {}
       end
     end
-
     return save_data
   end
 
@@ -315,9 +313,7 @@ class PokemonLoadScreen
         Game.start_new
         return
       when cmd_mystery_gift
-        pbFadeOutIn do
-          @save_data[:player] = pbDownloadMysteryGift(@save_data[:player])
-        end
+        pbFadeOutIn { pbDownloadMysteryGift(@save_data[:player]) }
       when cmd_options
         pbFadeOutIn do
           scene = PokemonOption_Scene.new

Data/Scripts/017_UI/023_PScreen_MoveRelearner.rb

@@ -97,7 +97,7 @@ class MoveRelearner_Scene
     textpos.push([basedamage<=1 ? basedamage==1 ? "???" : "---" : sprintf("%d",basedamage),
           468,146,2,Color.new(64,64,64),Color.new(176,176,176)])
     textpos.push([_INTL("ACCURACY"),272,178,0,Color.new(248,248,248),Color.new(0,0,0)])
-    textpos.push([accuracy==0 ? "---" : sprintf("%d%",accuracy),
+    textpos.push([accuracy==0 ? "---" : "#{accuracy}%",
           468,178,2,Color.new(64,64,64),Color.new(176,176,176)])
     pbDrawTextPositions(overlay,textpos)
     imagepos.push(["Graphics/Pictures/category",436,116,0,category*28,64,28])

Data/Scripts/017_UI/026_PScreen_MysteryGift.rb

@@ -324,7 +324,6 @@ def pbDownloadMysteryGift(trainer)
   pbDisposeMessageWindow(sprites["msgwindow"])
   pbDisposeSpriteHash(sprites)
   viewport.dispose
-  return trainer
 end
 
 #===============================================================================