Merge branch 'dev' into dev-gen8

Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb

@@ -47,8 +47,9 @@ def pbSelectAnim(canvas,animwin)
     ctlwin.update
     bmpwin.hue=ctlwin.value(0) if ctlwin.changed?(0)
     if Input.trigger?(Input::USE) && animfiles.length>0
-      bitmap=AnimatedBitmap.new("Graphics/Animations/"+cmdwin.commands[cmdwin.index],ctlwin.value(0)).deanimate
-      canvas.animation.graphic=cmdwin.commands[cmdwin.index]
+      filename = cmdwin.commands[cmdwin.index]
+      bitmap=AnimatedBitmap.new("Graphics/Animations/" + filename, ctlwin.value(0)).deanimate
+      canvas.animation.graphic = File.basename(filename, ".png")
       canvas.animation.hue=ctlwin.value(0)
       canvas.animbitmap=bitmap
       animwin.animbitmap=bitmap

Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb

@@ -1153,3 +1153,14 @@ DebugMenuCommands.register("invalidtiles", {
     pbDebugFixInvalidTiles
   }
 })
+
+DebugMenuCommands.register("reloadsystemcache", {
+  "parent"      => "othermenu",
+  "name"        => _INTL("Reload System Cache"),
+  "description" => _INTL("Refreshes the system's file cache. Use if you change a file while playing."),
+  "always_show" => true,
+  "effect"      => proc {
+    System.reload_cache
+    pbMessage(_INTL("Done."))
+  }
+})

Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb

@@ -83,16 +83,20 @@ PokemonDebugMenuCommands.register("setstatus", {
       ids = [:NONE]
       GameData::Status.each do |s|
         next if s.id == :NONE
-        commands.push(s.name)
+        commands.push(_INTL("Set {1}", s.name))
         ids.push(s.id)
       end
       loop do
-        cmd = screen.pbShowCommands(_INTL("Set {1}'s status.", pkmn.name), commands, cmd)
+        msg = _INTL("Current status: {1}", GameData::Status.get(pkmn.status).name)
+        if pkmn.status == :SLEEP
+          msg = _INTL("Current status: {1} (turns: {2})",
+             GameData::Status.get(pkmn.status).name, pkmn.statusCount)
+        end
+        cmd = screen.pbShowCommands(msg, commands, cmd)
         break if cmd < 0
         case cmd
         when 0   # Cure
           pkmn.heal_status
-          screen.pbDisplay(_INTL("{1}'s status was cured.", pkmn.name))
           screen.pbRefreshSingle(pkmnid)
         else   # Give status problem
           count = 0