Merge branch 'master' into dev

Data/Scripts/021_Debug/005_Editor_SaveData.rb

@@ -1330,7 +1330,7 @@ end
 # Save Shadow move data to PBS file
 #===============================================================================
 def pbSaveShadowMoves
-  moves = pbLoadShadowMovesets
+  shadow_movesets = pbLoadShadowMovesets
   File.open("PBS/shadowmoves.txt","wb") { |f|
     f.write(0xEF.chr)
     f.write(0xBB.chr)
@@ -1338,14 +1338,14 @@ def pbSaveShadowMoves
     f.write("\# "+_INTL("See the documentation on the wiki to learn how to edit this file."))
     f.write("\r\n")
     f.write("\#-------------------------------\r\n")
-    for i in 0...moves.length
-      move = moves[i]
-      next if !move || moves.length==0
+    for i in 0...shadow_movesets.length
+      moveset = shadow_movesets[i]
+      next if !moveset || moveset.length==0
       constname = (getConstantName(PBSpecies,i) rescue pbGetSpeciesConst(i) rescue nil)
       next if !constname
       f.write(sprintf("%s = ",constname))
       movenames = []
-      for m in move
+      for m in moveset
         movenames.push(GameData::Move.get(m).id.to_s)
       end
       f.write(sprintf("%s\r\n",movenames.compact.join(",")))

Data/Scripts/021_Debug/010_Editor_TilesetEditor.rb

@@ -101,9 +101,9 @@ class PokemonTilesetScene
     @x = 0
     @y = -TILE_SIZE
     @topy = -TILE_SIZE
+    height = @sprites["tileset"].bitmap.height
     pbUpdateTileset
     pbFadeInAndShow(@sprites)
-    height = @sprites["tileset"].bitmap.height
     ########
     loop do
       Graphics.update
@@ -161,6 +161,7 @@ class PokemonTilesetScene
           pbUpdateTileset
         when 2
           pbChooseTileset
+          height = @sprites["tileset"].bitmap.height
         end
       elsif Input.trigger?(Input::B)
         if pbConfirmMessage(_INTL("Save changes?"))